Fixes basemap chooser and dropdown styles
Removes unused var
Merge remote-tracking branch 'origin/feature/CDB-237' into release/2.5.2
Merge remote-tracking branch 'origin/fix/CDB-963' into release/2.5.2

Conflicts:
	lib/assets/javascripts/cartodb/common/dropdown_basemap.js
Updated submodule cdb