CDB-60 CDB-61 CDB-63 #resolve markup issues
Merge branch 'develop' of github.com:CartoDB/cartodb into develop