tinymce 4.01b integration + master merge

* Updates tinymce to 4.0b1
* Brings FEATURE-tinymce up to date with master