[maven-release-plugin] prepare release alohaeditor-0.23.21-commercial
[maven-release-plugin] prepare for next development iteration
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor

Conflicts:
	pom.xml