Update version
[maven-release-plugin] prepare release alohaeditor-0.24.26
Added generated changelog mapping
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release alohaeditor-0.24.26-commercial
Added generated changelog mapping
[maven-release-plugin] prepare for next development iteration
Remove bogus mapping
Merge branch 'hotfix-0.24.x' of github.com:alohaeditor/Aloha-Editor into hotfix-0.25.x

Conflicts:
	pom.xml
[maven-release-plugin] prepare release alohaeditor-0.25.8
Added generated changelog mapping
[maven-release-plugin] prepare for next development iteration
Merge branch 'hotfix-0.25.x' of github.com:alohaeditor/Aloha-Editor into dev

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

Conflicts:
	pom.xml