UI fixes
Merge branch 'master' of https://github.com/sunnyera/singingalong
video integration
Merge branch 'master' of https://github.com/sunnyera/singingalong