Don't treat admins special uploading content.
Merge branch 'master' of github.com:concerto/concerto