[maven-release-plugin] prepare release alohaeditor-0.24.36
Added generated changelog mapping
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release alohaeditor-0.24.36-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.17
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 hotfix-1.0.x

Conflicts:
	pom.xml