CDB-1111 #resolves Sets max and min zoom for google
Merge remote-tracking branch 'origin/fix/CDB-1111' into release/2.5.4

Conflicts:
	lib/assets/javascripts/cartodb/common/dropdown_basemap.js