Merge branch 'hotfix/modify_disk_quota_task'
Fix
Merge branch 'release/staging'

Conflicts:
	lib/tasks/db_maintenance.rake
Submodule versions
Fixes load_functions rake task
Adds rake task to update map calls for every user
Adds some output to update_map_calls task
Copy change: API calls => map views
Fixes cdb_checkquota function

Postgres integer was not enough to handle user quotas
Merge branch 'release/staging'

Conflicts:
	app/models/user.rb
	lib/assets/javascripts/cartodb/dashboard/d3stats.js
	lib/tasks/db_maintenance.rake
removed Jenks temporally
fixed #1697
Merge branch 'release/staging'
Merge branch 'release/staging'
fixing common data for dedicated instances
fixed styles for common_data page header
Fix marker opacity for the intensity wizard
Merge branch 'hotfix/intensity' into develop

* hotfix/intensity:
  Fix marker opacity for the intensity wizard
  fixed styles for common_data page header
  fixing common data for dedicated instances
  fixed #1697
  removed Jenks temporally
  Fixes cdb_checkquota function
  Copy change: API calls => map views
  Adds some output to update_map_calls task
  Adds rake task to update map calls for every user
  Fixes load_functions rake task
  Submodule versions
  Fix
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  fixed styles for common_data page header
  fixing common data for dedicated instances