update ckeditor
Update of ckeditor. Merge branch 'develop'