Closes #CDB-1179 Moves 'Label Placement' option below 'Label Overlap'
CDB-1449 #resolve Remove deprecated tables endpoints
Merge branch 'feature/cartodb-mu' into feature/CDB-1152
Add created_at to users
Sets min-height of the share window header
Merge branch 'master' into feature/CDB-1152
Add updated_at to users
Adds try_trial message
CDB-1082 #resolves Improves WMS error message
fixed migration from color wizard to category CDB-1554
Adds ClusterWizard element
Adds cluster generator
Merge from master
added error tracking code CDB-1573
removed test CDB-1573
CDB-1448 #resolve Remove AWS debugging logger
Adds trial notification
CDB-1384 #fixes Adds trial message for FREE users. Fixes a bug that prevented hiding the warning message when users deleted all their tables
Merge branch 'master' into CDB-1315

* master:
  Remove duplicated rubyzip gem definition
  Fix
  Remove mime type guessing
  Attempt to upload files to s3 directly using the gem
  fixed user stats specs
  Changes endpoint to the viz one
  Fixes merge functionality
CDB-1419 #resolve - rendering flash message in the correct block, or oauth or api_key