Singularize geometry types on georeferencer dialog
Merge branch 'CDB-1699' of github.com:CartoDB/cartodb into CDB-1699