fixed ckeditor extension
solved merge conflicts
Merge pull request #412 from massiveart/feature/wysiwyg-editor

fixed ckeditor extension