CDB-967 #fixes Preserves the items from the old ColorLegend/ColorWizard when appliying a CategoryLegend/CategoryWizard
Merge branch 'feature/CDB-967' of github.com:CartoDB/cartodb into feature/CDB-967

* 'feature/CDB-967' of github.com:CartoDB/cartodb:
  Preserves the items from the old ColorLegend/ColorWizard when appliying a CategoryLegend/CategoryWizard