Revert "Revert "build updates, merging TinyMCE""

This reverts commit 9ddaba64328c3a664b3f05047233f23ea4c6fb1b.