Fix javascript errors
Fix javascript errors
Reverts e2ffcf9788e4b6a4fafc2f2aa95171d3bd7cdd51
Add changelog entry for previous revert
Merge branch 'dev' of ssh://github.com/alohaeditor/Aloha-Editor into dev