small changes with fileupload
Merge branch 'master' of https://github.com/dni/publish-
upload, n stuff, buggy