Updates to image uploader and removed tmp folder files from source control
Merged from trunk