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

Conflicts:
	build/changelog/entries/2014/03/10031.RT13396.bugfix
Update junit selenium qunit runner