Merge pull request #1 from JedWatson/master

update
#226 Enable inserting images from tinymce editor
#266 Enable inserting images from tinymce editor
Merge pull request #267 from brankosekulic/master

Enable inserting images from tinymce editor