Removes console.log
In the spatial merge, selects COUNT as default merge method
Adds the_geom to the list of mandatory cols
Merge branch 'release/staging' of github.com:CartoDB/cartodb20 into release/staging

* 'release/staging' of github.com:CartoDB/cartodb20:
  fixed problem positioning line-stroke wizard forms
  common submodule updated