add support for a better upload
Merge pull request #52 from SIMS-Topaz/aja/better_picture_upload

add a better upload support
Merge branch 'master' into hmu/issues_43

Conflicts:
	test/test.topaz-app.js