request the_geom only when is needed CDB-1244
updated cub
Merge remote-tracking branch 'origin/feature/CDB-1244' into release/2.6.1

Conflicts:
	vendor/assets/javascripts/cartodb.uncompressed.js
Merge branch 'release/2.6.1' of github.com:CartoDB/cartodb into release/2.6.1