Merged with samy and everything working
updating to master
Merge pull request #277 from ndomar/C1S21_NewUploadImage

C1 s21 new upload image
updating to master