Videocalling updates
Merge pull request #433 from lring/develop

Videocalling updates