Merge branch 'hotfix-0.24.x' of github.com:alohaeditor/Aloha-Editor into dev

Conflicts:
	pom.xml
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into hotfix-0.25.x

Conflicts:
	pom.xml