added tinymce editor
conflict merge
changes
conflict solved