Better upload button
Merge branch 'master' of https://github.com/pselle/stash-video