JS fix
Merge branch 'master' of github.com:Xkeeper/uploader