fixed some specs in jasmine 2
fixed merge tables dialog spec
fixed basemap chooser specs
fixed wizard specs
Merge branch 'CDB-1555' of github.com:CartoDB/cartodb into CDB-1555
Merge branch 'CDB-1555' of github.com:CartoDB/cartodb into CDB-1555
fixed some specs
Merge branch 'CDB-1555' of github.com:CartoDB/cartodb into CDB-1555