updated tinymce config
updated tinymce skin
Merge branch 'master' into afro