added tinymce to resource new & edit
Merge branch 'tinymce'