Merge branch 'master' of https://github.com/emCOMP/crisis-curation
fix color picker
Merge branch 'master' of https://github.com/emCOMP/crisis-curation
change ng-hide to collapse