Content upload finetuning
Merge branch 'master' of https://github.com/envubeamer/beamer-app