edit evimage
Merge branch 'master' of https://github.com/Evaneos/ev-fdm

Conflicts:
	plugins/tinymce/js/plugins/evimage.js