Merged from sub repository (updated ckeditor, filters - step 2)