Merge branch 'devel' into ui-improvements
Updated toolbar and added sidebar toggling functionality
Fixed layout of ColumnEditView
Merge pull request #28 from SixAppeal/ui-improvements

Ui improvements