Fixes to uploader
Merge branch 'master' of https://github.com/brnacl/mixstudio