Resolved merge conflicts.
Resolved merge conflicts.

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