merge conflicts
merge conflicts

thorncp/cartodb,DigitalCoder/cartodb,splashblot/dronedb,splashblot/dronedb,UCL-ShippingGroup/cartodb-1,thorncp/cartodb,codeandtheory/cartodb,bloomberg/cartodb,future-analytics/cartodb,bloomberg/cartodb,bloomberg/cartodb,codeandtheory/cartodb,raquel-ucl/cartodb,raquel-ucl/cartodb,nyimbi/cartodb,dbirchak/cartodb,bloomberg/cartodb,nuxcode/cartodb,splashblot/dronedb,UCL-ShippingGroup/cartodb-1,thorncp/cartodb,UCL-ShippingGroup/cartodb-1,future-analytics/cartodb,DigitalCoder/cartodb,UCL-ShippingGroup/cartodb-1,dbirchak/cartodb,codeandtheory/cartodb,nuxcode/cartodb,dbirchak/cartodb,nuxcode/cartodb,UCL-ShippingGroup/cartodb-1,thorncp/cartodb,future-analytics/cartodb,raquel-ucl/cartodb,dbirchak/cartodb,codeandtheory/cartodb,bloomberg/cartodb,CartoDB/cartodb,splashblot/dronedb,future-analytics/cartodb,CartoDB/cartodb,dbirchak/cartodb,CartoDB/cartodb,nyimbi/cartodb,CartoDB/cartodb,thorncp/cartodb,raquel-ucl/cartodb,DigitalCoder/cartodb,DigitalCoder/cartodb,nyimbi/cartodb,future-analytics/cartodb,nyimbi/cartodb,nuxcode/cartodb,DigitalCoder/cartodb,splashblot/dronedb,nyimbi/cartodb,CartoDB/cartodb,nuxcode/cartodb,codeandtheory/cartodb,raquel-ucl/cartodb