Merge branch 'commercial-hotfix-batu-fr1' of github.com:alohaeditor/Aloha-Editor into commercial-release-batu-fr1
Updated css and prepared changelog for release
[maven-release-plugin] prepare release alohaeditor-0.23.0-commercial
[maven-release-plugin] prepare for next development iteration
Prepared for gpl release
[maven-release-plugin] prepare release alohaeditor-0.23.0
[maven-release-plugin] prepare for next development iteration
Merge branch 'commercial-release-batu-fr1' of github.com:alohaeditor/Aloha-Editor

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

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

Conflicts:
	build/dev-changelog.md