Merge branch 'master' into CDB-4165

Conflicts:
	NEWS.md
	config/frontend.yml
	lib/build/package.json
	vendor/assets/javascripts/cartodb.uncompressed.js
Merge branch 'CDB-4165' of https://github.com/CartoDB/cartodb into CDB-4165

Conflicts:
	NEWS.md
	config/frontend.yml