added tinyMCE into resources
Merge branch 'jordan'

merged with local branch