Fixed issue #76
Fixed indentation in imagehandler classes and did a little refactoring
Merge branch 'master' of
https://github.com/jemproject/JEM-11CONVERTVERSION.git

Conflicts:
	admin/views/imagehandler/tmpl/uploadimage.php
	admin/views/imagehandler/view.html.php
	site/classes/image.class.php