Merge branch 'master' into gh-pages
Replacing "tinymce" with "editor" in formatting icon classes
Merge branch 'gh-pages'