Add tinymce
Merge branch 'near'