Merge branch 'hotfix/fix_user_api_calls'
[importer] Implement rake task to create importer schema for those users that don't have it
clean up
[importer] Assign cdb_importer schema using User#set_database_permissions_in_importer_schema

Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
[importer] Report progress in rake task to create the schema for the importer
Fix cherry-pick
Disabled dataimport within user relocation
[relocator] Serialize visualization for postgres before inserting
Release 2.1.2
Fixed problem loading viz stats within relocation
CDB-18 #resolve Get users over map view quota on a single request
CDB-60 CDB-61 CDB-63 #resolve markup issues
Merge branch 'develop' of github.com:CartoDB/cartodb into develop
CDB-57 #close Adds message explaining how the custom legends work
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  CDB-60 CDB-61 CDB-63 #resolve markup issues
[relocator] Implement MapViewMetadata
CDB-135 #resolve [relocator] Dump and load map views metadata
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
[relocator] Implement MapViewMetadata
CDB-135 #resolve [relocator] Dump and load map views metadata