fixed form updating on geomeytry_type changes CDB-1431
Merge branch 'release/2.8.0' of github.com:CartoDB/cartodb into release/2.8.0