Updated dev branch artifact version.
Updated artifact version for next release
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into release
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into release
Squashed commit of the following:

commit 08e0b6156793f0d3998ce8b024e63fcdfd60ce62
Author: Clemens Prerovsky <c.prerovsky@gentics.com>
Date:   Mon Jan 7 16:27:59 2013 +0100

    made internationalization work

commit 94bd9dce75d8c2c49211e0a33bf4090d5b90fce8
Author: Clemens Prerovsky <c.prerovsky@gentics.com>
Date:   Mon Jan 7 16:27:52 2013 +0100

    made internationalization work

commit 1f2f05f15ebec612645437ccb53f893744468f34
Merge: 91a00c9 185e0fb
Author: Clemens Prerovsky <c.prerovsky@gentics.com>
Date:   Mon Jan 7 16:13:05 2013 +0100

    Merge branch 'hotfix-textcolor-plugin' of github.com:cprerovsky/Aloha-Editor into hotfix-textcolor-plugin

commit 91a00c927d41a3c52b5a5a0119f4ed2b3abd2b64
Author: Lakshan Perera <lakshan@web2media.net>
Date:   Wed Jan 2 22:41:46 2013 +0530

    Added the colorpicker plugin

commit 185e0fb371fad77b39aed933cee02dd12787185b
Author: Lakshan Perera <lakshan@web2media.net>
Date:   Wed Jan 2 22:41:46 2013 +0530

    Added the colorpicker plugin
Merge branch 'hotfix' of git://github.com/maschonber/Aloha-Editor into release
Prepared changelog for release
[maven-release-plugin] prepare release alohaeditor-0.22.7
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release alohaeditor-0.22.7-commercial
[maven-release-plugin] prepare for next development iteration
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into hotfix

Conflicts:
	build/hotfix-changelog.md