[importer] Limit encoding detection to first 1000 characters
[importer] Extract encoding detection character limit to a constant
[importer] Work around inconsistent IO#gets in ruby 1.9.2
[importer] Memoize CsvNormalizer#first_line
[importer] Ogr2ogr accepts encoding as a passed option
[importer] Pass detected encoding to Ogr2ogr
[importer] Do not normalize CSVs with Ctrl-M EOLs
CDB-225 #resolve [importer] Mark a DataImport as failed when stuck
update accepted formats in create new table dialog
Merge branch 'release/2.1.3.2'

Conflicts:
	services/importer/lib/importer/csv_normalizer.rb
Merge remote-tracking branch 'origin/release/2.1.3.2'
Merge remote-tracking branch 'origin/release/2.1.3.2'
Merge branch 'master' into develop

Conflicts:
	app/assets/stylesheets/common
Merge branch 'develop' of github.com:CartoDB/cartodb into develop
CDB-261 #resolve update stylesheets