Fix javascript errors
Fix javascript errors
Merge branch 'dev' of ssh://github.com/alohaeditor/Aloha-Editor into dev