CDB-160 #fixed choroplet not working
CDB-154 #fixed
CDB-154 fixed wizards
fixed wizard stuff
Merge branch 'release/staging' of github.com:CartoDB/cartodb into release/staging