fixed merge conflict
fixed merge conflict

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