Merge branch 'feature/CDB-363' into feature/CDB-967
fixed problem when user had color wizard and app transforms to category
CDB-931 Tag upgrade links
CDB-931 Fix specs for upgrade links
fixed problem when user had color wizard and app transforms to category
test things enabled
Merge branch 'feature/CDB-967' of github.com:CartoDB/cartodb20 into feature/CDB-967
added control function to know if applied wizard come from a color or not
Preserves the items from the old ColorLegend/ColorWizard when appliying a CategoryLegend/CategoryWizard
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
added more tests for category wizard + removed color tab from wizards list
added a new test to carto_wizard -> categories
Merge remote-tracking branch 'origin/feature/CDB-931' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-967' into release/2.5.1