Merge remote-tracking branch 'sourcefabric/aap' into aap
Merge remote-tracking branch 'sourcefabric/aap' into aap
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 #159 from gizm0bill/aap

NR-953 : Aloha editor - fix toolbar