take care about new release of TinyMCE
Merge branch '1.4.6' of https://github.com/zenphoto/zenphoto into 1.4.6