Merge branch 'master' of zerogoki:/home/git/repos/private/marco/VideoStreaming