fixed merge conflict
fixed merge conflict

ayumilong/rethinkdb,Qinusty/rethinkdb,gavioto/rethinkdb,dparnell/rethinkdb,jmptrader/rethinkdb,Wilbeibi/rethinkdb,catroot/rethinkdb,urandu/rethinkdb,mquandalle/rethinkdb,yaolinz/rethinkdb,grandquista/rethinkdb,catroot/rethinkdb,marshall007/rethinkdb,rrampage/rethinkdb,catroot/rethinkdb,jesseditson/rethinkdb,captainpete/rethinkdb,mquandalle/rethinkdb,yakovenkodenis/rethinkdb,yakovenkodenis/rethinkdb,bchavez/rethinkdb,victorbriz/rethinkdb,AntouanK/rethinkdb,yaolinz/rethinkdb,victorbriz/rethinkdb,bchavez/rethinkdb,eliangidoni/rethinkdb,yakovenkodenis/rethinkdb,catroot/rethinkdb,sebadiaz/rethinkdb,robertjpayne/rethinkdb,elkingtonmcb/rethinkdb,mbroadst/rethinkdb,yakovenkodenis/rethinkdb,wojons/rethinkdb,victorbriz/rethinkdb,yaolinz/rethinkdb,AntouanK/rethinkdb,gdi2290/rethinkdb,mquandalle/rethinkdb,eliangidoni/rethinkdb,pap/rethinkdb,elkingtonmcb/rethinkdb,matthaywardwebdesign/rethinkdb,wkennington/rethinkdb,tempbottle/rethinkdb,dparnell/rethinkdb,Wilbeibi/rethinkdb,robertjpayne/rethinkdb,jesseditson/rethinkdb,urandu/rethinkdb,sbusso/rethinkdb,Wilbeibi/rethinkdb,robertjpayne/rethinkdb,rrampage/rethinkdb,dparnell/rethinkdb,sbusso/rethinkdb,rrampage/rethinkdb,KSanthanam/rethinkdb,niieani/rethinkdb,JackieXie168/rethinkdb,wujf/rethinkdb,matthaywardwebdesign/rethinkdb,eliangidoni/rethinkdb,AntouanK/rethinkdb,gdi2290/rethinkdb,JackieXie168/rethinkdb,eliangidoni/rethinkdb,RubenKelevra/rethinkdb,ayumilong/rethinkdb,sebadiaz/rethinkdb,ajose01/rethinkdb,bchavez/rethinkdb,urandu/rethinkdb,jmptrader/rethinkdb,AntouanK/rethinkdb,gavioto/rethinkdb,catroot/rethinkdb,Qinusty/rethinkdb,alash3al/rethinkdb,lenstr/rethinkdb,niieani/rethinkdb,marshall007/rethinkdb,bpradipt/rethinkdb,captainpete/rethinkdb,sebadiaz/rethinkdb,victorbriz/rethinkdb,alash3al/rethinkdb,gavioto/rethinkdb,niieani/rethinkdb,yakovenkodenis/rethinkdb,greyhwndz/rethinkdb,captainpete/rethinkdb,4talesa/rethinkdb,RubenKelevra/rethinkdb,gavioto/rethinkdb,alash3al/rethinkdb,pap/rethinkdb,mbroadst/rethinkdb,JackieXie168/rethinkdb,RubenKelevra/rethinkdb,greyhwndz/rethinkdb,spblightadv/rethinkdb,Qinusty/rethinkdb,spblightadv/rethinkdb,marshall007/rethinkdb,grandquista/rethinkdb,pap/rethinkdb,jesseditson/rethinkdb,4talesa/rethinkdb,wujf/rethinkdb,AntouanK/rethinkdb,4talesa/rethinkdb,mbroadst/rethinkdb,wojons/rethinkdb,Qinusty/rethinkdb,mcanthony/rethinkdb,RubenKelevra/rethinkdb,victorbriz/rethinkdb,greyhwndz/rethinkdb,mbroadst/rethinkdb,ayumilong/rethinkdb,urandu/rethinkdb,mbroadst/rethinkdb,dparnell/rethinkdb,mquandalle/rethinkdb,wkennington/rethinkdb,urandu/rethinkdb,jmptrader/rethinkdb,JackieXie168/rethinkdb,robertjpayne/rethinkdb,ajose01/rethinkdb,wkennington/rethinkdb,grandquista/rethinkdb,catroot/rethinkdb,dparnell/rethinkdb,mbroadst/rethinkdb,bchavez/rethinkdb,losywee/rethinkdb,yaolinz/rethinkdb,ayumilong/rethinkdb,sontek/rethinkdb,jesseditson/rethinkdb,captainpete/rethinkdb,ajose01/rethinkdb,marshall007/rethinkdb,scripni/rethinkdb,eliangidoni/rethinkdb,robertjpayne/rethinkdb,4talesa/rethinkdb,rrampage/rethinkdb,elkingtonmcb/rethinkdb,jmptrader/rethinkdb,Qinusty/rethinkdb,pap/rethinkdb,niieani/rethinkdb,gavioto/rethinkdb,sbusso/rethinkdb,mquandalle/rethinkdb,niieani/rethinkdb,spblightadv/rethinkdb,AntouanK/rethinkdb,yakovenkodenis/rethinkdb,lenstr/rethinkdb,tempbottle/rethinkdb,mquandalle/rethinkdb,grandquista/rethinkdb,marshall007/rethinkdb,scripni/rethinkdb,catroot/rethinkdb,mbroadst/rethinkdb,tempbottle/rethinkdb,captainpete/rethinkdb,Wilbeibi/rethinkdb,JackieXie168/rethinkdb,urandu/rethinkdb,greyhwndz/rethinkdb,ajose01/rethinkdb,Wilbeibi/rethinkdb,yakovenkodenis/rethinkdb,pap/rethinkdb,alash3al/rethinkdb,captainpete/rethinkdb,greyhwndz/rethinkdb,jmptrader/rethinkdb,sbusso/rethinkdb,JackieXie168/rethinkdb,wkennington/rethinkdb,grandquista/rethinkdb,rrampage/rethinkdb,lenstr/rethinkdb,alash3al/rethinkdb,wojons/rethinkdb,niieani/rethinkdb,greyhwndz/rethinkdb,tempbottle/rethinkdb,matthaywardwebdesign/rethinkdb,gavioto/rethinkdb,mcanthony/rethinkdb,sebadiaz/rethinkdb,losywee/rethinkdb,wujf/rethinkdb,RubenKelevra/rethinkdb,sebadiaz/rethinkdb,bpradipt/rethinkdb,wojons/rethinkdb,JackieXie168/rethinkdb,eliangidoni/rethinkdb,spblightadv/rethinkdb,pap/rethinkdb,Wilbeibi/rethinkdb,jesseditson/rethinkdb,dparnell/rethinkdb,niieani/rethinkdb,wkennington/rethinkdb,mcanthony/rethinkdb,KSanthanam/rethinkdb,sebadiaz/rethinkdb,scripni/rethinkdb,catroot/rethinkdb,losywee/rethinkdb,sbusso/rethinkdb,mcanthony/rethinkdb,bpradipt/rethinkdb,ajose01/rethinkdb,wojons/rethinkdb,gdi2290/rethinkdb,mcanthony/rethinkdb,victorbriz/rethinkdb,elkingtonmcb/rethinkdb,mcanthony/rethinkdb,ayumilong/rethinkdb,elkingtonmcb/rethinkdb,grandquista/rethinkdb,jmptrader/rethinkdb,scripni/rethinkdb,spblightadv/rethinkdb,lenstr/rethinkdb,ayumilong/rethinkdb,wkennington/rethinkdb,pap/rethinkdb,dparnell/rethinkdb,losywee/rethinkdb,jesseditson/rethinkdb,spblightadv/rethinkdb,lenstr/rethinkdb,robertjpayne/rethinkdb,ayumilong/rethinkdb,ayumilong/rethinkdb,urandu/rethinkdb,rrampage/rethinkdb,gdi2290/rethinkdb,scripni/rethinkdb,Qinusty/rethinkdb,rrampage/rethinkdb,sebadiaz/rethinkdb,JackieXie168/rethinkdb,Qinusty/rethinkdb,bpradipt/rethinkdb,gavioto/rethinkdb,bchavez/rethinkdb,greyhwndz/rethinkdb,sontek/rethinkdb,lenstr/rethinkdb,RubenKelevra/rethinkdb,matthaywardwebdesign/rethinkdb,RubenKelevra/rethinkdb,4talesa/rethinkdb,alash3al/rethinkdb,tempbottle/rethinkdb,wojons/rethinkdb,elkingtonmcb/rethinkdb,gdi2290/rethinkdb,sontek/rethinkdb,sbusso/rethinkdb,wkennington/rethinkdb,yaolinz/rethinkdb,mquandalle/rethinkdb,Wilbeibi/rethinkdb,marshall007/rethinkdb,yaolinz/rethinkdb,wojons/rethinkdb,Wilbeibi/rethinkdb,captainpete/rethinkdb,grandquista/rethinkdb,wujf/rethinkdb,yaolinz/rethinkdb,grandquista/rethinkdb,jmptrader/rethinkdb,marshall007/rethinkdb,grandquista/rethinkdb,losywee/rethinkdb,sontek/rethinkdb,jmptrader/rethinkdb,wujf/rethinkdb,captainpete/rethinkdb,elkingtonmcb/rethinkdb,tempbottle/rethinkdb,4talesa/rethinkdb,bchavez/rethinkdb,KSanthanam/rethinkdb,lenstr/rethinkdb,eliangidoni/rethinkdb,RubenKelevra/rethinkdb,gdi2290/rethinkdb,dparnell/rethinkdb,losywee/rethinkdb,bchavez/rethinkdb,tempbottle/rethinkdb,victorbriz/rethinkdb,niieani/rethinkdb,ajose01/rethinkdb,alash3al/rethinkdb,KSanthanam/rethinkdb,bpradipt/rethinkdb,sbusso/rethinkdb,matthaywardwebdesign/rethinkdb,scripni/rethinkdb,ajose01/rethinkdb,sebadiaz/rethinkdb,scripni/rethinkdb,robertjpayne/rethinkdb,wkennington/rethinkdb,KSanthanam/rethinkdb,mcanthony/rethinkdb,losywee/rethinkdb,matthaywardwebdesign/rethinkdb,greyhwndz/rethinkdb,scripni/rethinkdb,bpradipt/rethinkdb,AntouanK/rethinkdb,sbusso/rethinkdb,bpradipt/rethinkdb,bchavez/rethinkdb,mcanthony/rethinkdb,matthaywardwebdesign/rethinkdb,dparnell/rethinkdb,jesseditson/rethinkdb,Qinusty/rethinkdb,gdi2290/rethinkdb,sontek/rethinkdb,elkingtonmcb/rethinkdb,yaolinz/rethinkdb,eliangidoni/rethinkdb,matthaywardwebdesign/rethinkdb,KSanthanam/rethinkdb,AntouanK/rethinkdb,marshall007/rethinkdb,mbroadst/rethinkdb,urandu/rethinkdb,bpradipt/rethinkdb,spblightadv/rethinkdb,wojons/rethinkdb,sontek/rethinkdb,wujf/rethinkdb,KSanthanam/rethinkdb,bchavez/rethinkdb,bpradipt/rethinkdb,gavioto/rethinkdb,yakovenkodenis/rethinkdb,robertjpayne/rethinkdb,robertjpayne/rethinkdb,spblightadv/rethinkdb,sontek/rethinkdb,lenstr/rethinkdb,4talesa/rethinkdb,ajose01/rethinkdb,pap/rethinkdb,victorbriz/rethinkdb,sontek/rethinkdb,losywee/rethinkdb,rrampage/rethinkdb,mbroadst/rethinkdb,wujf/rethinkdb,alash3al/rethinkdb,tempbottle/rethinkdb,JackieXie168/rethinkdb,mquandalle/rethinkdb,eliangidoni/rethinkdb,4talesa/rethinkdb,jesseditson/rethinkdb,KSanthanam/rethinkdb,Qinusty/rethinkdb