CDB-1686 #resolves Adds Eco Basemap
Merge remote-tracking branch 'origin/CDB-1686' into release/2.11.1

Conflicts:
	lib/assets/javascripts/cartodb/table/default_layers.js