search1.2.0-release
Removed Farbtastic and created an ad hoc color picker (cherry picked from commit 96ec70e800b048a3845961f9adde039d9c3bf084) Conflicts: apps/search/src/search/templates/admin_collection_template.mako apps/search/static/css/admin.css