TinyMCE config
Merge branch 'master' into Refactoring-files