bug fixed for production
merge branch 'master' of github.com:AndreasJaeger/youtube-demo into r2_contacts

Merge adapted master branch