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-967' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-983' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-988-nokia-geocoding-api-not-working' into release/2.5.1

Conflicts:
	spec/models/geocoding_spec.rb
Merge remote-tracking branch 'origin/bug/CDB-992' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-993' into release/2.5.1
Merge remote-tracking branch 'origin/bug/CDB-994' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-995' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-1002' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-1004' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-1008' into release/2.5.1
Merge remote-tracking branch 'origin/feature/CDB-1011' into release/2.5.1
Merge remote-tracking branch 'origin/fix/CDB-1016' into release/2.5.1
Merge remote-tracking branch 'origin/bug/CDB-1018' into release/2.5.1
Merge remote-tracking branch 'origin/feature/asset-sync' into release/2.5.1
Updated submodule cdb
Merge branch 'release/2.5.1' of github.com:CartoDB/cartodb into release/2.5.1