merge conflicts
merge conflicts

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