Added colorpicker
Added tests
Fixed merge conflicts
Merge pull request #71 from Label305/feature_input-colorpicker

Feature input colorpicker