Minor changes
Merge branch 'dev' of git://github.com/wysiwhat/Aloha-Editor into dev
Merge branch 'dev' of git://github.com/wysiwhat/Aloha-Editor into dev
Merge branch 'dev' of git://github.com/wysiwhat/Aloha-Editor into dev