add tinymce 4
merge