Added categories to task model
Added ColorComboBox
Merge branch 'devel' into ui-improvements
Color integration in TaskView
Fixed color integration
Merge branch 'devel' into ui-improvements
added copyright declaration to ColorComboBox.java
Merge pull request #70 from SixAppeal/ui-improvements

Ui improvements