Colorpicker updates
[#320]Update UI for Colorpicker

fixes #320
Merge remote-tracking branch 'flukeout/colorpicker' into colorpicker

Conflicts:
	views/color-picker/index.html
	views/color-picker/index.js
remove fa
Merge pull request #618 from k88hudson/colorpicker

Colorpicker