Merge branch 'feature/CDB-814' into feature/CDB-876
fixing safari styles problem clearing a filter
sync error background added
Replicate database_password to redis when creating a user
Changes for distributed platform
fixed export CDB-946
some torque interaction texts fixed
Merge branch 'feature/CDB-363' of github.com:CartoDB/cartodb20 into feature/CDB-363
cdb updated
Merge remote-tracking branch 'origin/feature/distributed' into release/2.5.0
CDB-939 #resolve Fixes start and end timestamps to show a valid date. This fixes the counter.
Merge branch 'feature/CDB-363' of github.com:CartoDB/cartodb into feature/CDB-363

* 'feature/CDB-363' of github.com:CartoDB/cartodb:
  cdb updated
CDB-942 #resolve Replaces the map error with a error dialog when the user tries to add a new torque layer
Merge remote-tracking branch 'origin/feature/CDB-868-replicate-db-password-to-redis' into release/2.5.0

Conflicts:
	app/models/user.rb
added stat_tag to torque layers in vizjson CDB-363
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