fix ckeditor custom config
Merge branch 'development'

* development:
  fix ckeditor custom config