Add "aloha-block-collection" class to table cell wrapper editables
Merge branch 'hotfix-0.24.x' of github.com:alohaeditor/Aloha-Editor into hotfix
Add "aloha-block-collection" class to table cell wrapper editables

(cherry picked from commit 973d13e06eeeaab8affe7fd5af9316892a665baf)
Merge branch 'hotfix-0.25.x' of github.com:alohaeditor/Aloha-Editor into hotfix-0.25.x
Merge branch 'hotfix-0.25.x' of github.com:alohaeditor/Aloha-Editor into hotfix
Fix changelog entry
[maven-release-plugin] prepare release alohaeditor-0.25.1
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

Conflicts:
	build/changelog/entries/2014/03/10031.RT13396.bugfix