Adds CategoryLegend
Merge branch 'develop' of git://github.com/CartoDB/cartodb.js into develop

* 'develop' of git://github.com/CartoDB/cartodb.js:
  removed v3