Removed htmlentities
Merge branch 'leapfrog-faster-cartodb' of github.com:CartoDB/cartodb into leapfrog-faster-cartodb