Merge pull request #1 from fear-sfx/master

b
fixing bugs in Upload(Internel Server Error 500, File already exists and other)
Merge pull request #2 from quattrobg/master

Fixing bugs in uploader