adds ckeditor4
Merge commit '2c867bf'