CDB-968 #resolves Reduces the number of columns of the basemap dropdown to 3. Fixes line-height of the links in the dropdown.
Merge remote-tracking branch 'origin/fix/CDB-968' into release/2.5.2

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