CKeditor included in nocms-admin
Merge branch 'features/ckeditor'