video conf UI added
Merge branch 'master' of github.com:mccainz/hackathon