bring back some accidentally deletd lines
Merge branch 'dev' of github.com:wysiwhat/Aloha-Editor into dev