add ckeditor;
modify index
Merge origin/master