Merge branch 'master' of https://github.com/mgijsberti/hippo-ckeditor-plugins into HEAD

Conflicts:
	ckeditor-plugins/pom.xml