Target 2.1.3
CDB-54 #comment Stub acceptance spec for CSVs with non-comma delimiters
CDB-54 #comment Implement CsvNormalizer#encoding and CsvNormalizer#delimiter
Fixed problem loading viz stats within relocation
CDB-96 #comment Add per-user and per-database statement_timeout values
Add timeout attributes to the superadmin API
Fix wrong require in CsvNormalizer spec
Add charlock_holmes to Gemfile. It detects file encodings to be used in the importer
CDB-134 #resolve Reintroduce database.yml.sample
CDB-54 #comment Implement CsvNormalizer#normalize
CDB-54 #resolve [importer] Normalize non-standard CSVs
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
Add kind attribute to Asset model