Aloha editor - fixed toolbar

merged devel