Merge branch 'feature/superadmin_show'
fixed default order in sql views #1469
Optionally calculate table size using pg_total_relation_size
Merge branch 'release/staging'

Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
Adds dropdown
Reload sprites
Merge branch 'develop' of github.com:CartoDB/cartodb20 into dropdown
Merge branch 'p2'

* p2:
  Improves mixins (adds base colors and more methods)
  Adds table html and css
  Improves mixins
  Refreshes sprites
  Adds more data and some sprites
  Adds real data
  Adds table styles
  Adds new route and public_tables page
  removed unnecessary debugger
  When merging, now, we are adding the data of the second table
  Fixes header tag tests
  Refreshes sprites
  Refreshes sprites
Adds light transition for the back button
Adds automatic imports
Add new feature list appears horizontally, and not vertically
Adds dropdown for basemaps
Refreshes sprites
Adds more spacing to plus.png
Merge branch 'release/staging'

Conflicts:
	app/assets/stylesheets/common
	app/views/admin/pages/tables.html.erb
	lib/assets/javascripts/cartodb/dashboard/dashboard.js
Correct version of both submodules
embed map hotfix
reworded auth denial text
Layer removal
Reduces the opacity of the not-selected wizards