added ckeditor
custom ckeditor file
fixed conflict