Merge remote-tracking branch 'sourcefabric/aap' into aap
Merge remote-tracking branch 'sourcefabric/aap' into aap
NR-934: Define/configure the Kanban view for every desk

Fix board color equality check.
Merge remote-tracking branch 'sourcefabric/aap' into aap
NR-953 : Aloha editor - fix toolbar

implemented aloha's ui-a-la-carte branch
Merge pull request #148 from petrjasek/aap

NR-934: Define/configure the Kanban view for every desk
Merge pull request #159 from gizm0bill/aap

NR-953 : Aloha editor - fix toolbar