CKEditor added
Merge branch 'master' into ckeditor