hotfix: dropbox chooser button class
Merge branch 'develop' of github.com:CartoDB/cartodb into develop
Merge branch 'release/staging' into develop
Do not save the user record inside an after_create
Merge branch 'hotfix/fix_user_account_provision' into develop
CDB-319 #resolve Don't set a POINT constraint when adding a geometry column
CDB-315 #resolve [importer] Return default encoding if CharlockHolmes raises
Ensure new_importer returns a success status
CDB-320 #resolve Do not keep problematic files in 'failed_imports' directory
CDB-135 #resolve [importer] Raise EmptyFileError when loading empty files
Integrate sql tests on rspec test suite
Update sql README
Remove old rake task to run the sql tests
Remove old export code
CDB-312 #resolve Implement table quota controls in DataImport
Merge branch 'release/staging'

Conflicts:
	app/models/data_import.rb