added ckeditor files
Merge branch 'master' into ckeditor