Fixed file upload and download
Merge branch 'master' of github.com:xp1990/shiwarepository.git