richtext with tinymce\!
merge conflicts with master