fixed wizards when the query does not have geometry_types CDB-1431
fixed wizards when there is no geometry from the beginning CDB-1446
Merge branch 'release/2.8.0' of github.com:CartoDB/cartodb into release/2.8.0