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

fixed ckeditor extension
build new version
Merge branch 'release/0.9' into develop
merged with develop