file upload fix
Merge branch 'master' of https://github.com/Proliner/Hotornot