Merge pull request #2 from emanuelschuetze/editor

Last fixes for ckeditor integration