* WIP
Merge branch 'master' of https://github.com/asenovm/edu-video-client