Merge remote-tracking branch 'origin/feature/CDB-876' into release/2.5.0
mapviews with torque CDB-933
updated cdb
Merge branch 'feature/CDB-363' of github.com:CartoDB/cartodb into feature/CDB-363
fixed CDB-940 CDB-363
Merge remote-tracking branch 'origin/feature/CDB-363' into release/2.5.0
fixed creating visualizations with torque layers from scratch CDB-363 CDB-936
Syntax error fail on rebase
fixed editing in torque layer CDB-949 CDB-363
Merge remote-tracking branch 'origin/feature/CDB-801' into release/2.5.0
CDB-947 #resolve Fixes geocoding error when the data contains line breaks

Remove any line breaks before sending the file to the geocoder API
Merge branch 'cartodb_test_prepare_2' of github.com:strk/cartodb into release/2.5.0

Conflicts:
	lib/tasks/setup.rake
Updated submodule cdb
CDB-948 #resolve Fixes error when cancelling geocoding jobs

Don't raise the error when the batch geocoding API refuses to cancel
the geocoding job.
Retry the cancel request 5 times
Report cancelling errors
next steps with new torque dragging
fixed CDB-955
hide elements when embed_map fails CDB-363
fixed CDB-927 CDB-363
fixed time_slider column types CDB-929 CDB-363
Merge remote-tracking branch 'origin/feature/CDB-363' into release/2.5.0

Conflicts:
	lib/assets/javascripts/cdb