fix for missing TinyMCE

thanks https://github.com/tonyjbutler
bump version to 2.5.0
Merge branch 'master' into master_BFC
Merge changes from upstream master (conflicts resolved)