Merge branch 'devel' into ui-improvements
TaskView redesign
Layout fixes and color changes
Merge pull request #22 from SixAppeal/ui-improvements

Ui improvements