Working image upload and download
Merge branch 'master' into Rohini