sprint 1 bug fixes
Merge branch 'master' of github.com:NebelTVOrg/nebel.tv-teaser