updated tinymce config
Merge branch 'master' into kingman