Sets the right class
Merge branch 'fix/CDB-817' into develop

* fix/CDB-817:
  Sets the right class for some legends
Merge branch 'develop' of git://github.com/CartoDB/cartodb.js into develop

* 'develop' of git://github.com/CartoDB/cartodb.js:
  fixed rendering when variables are used
  fixed makefile