Brought uptodate.
Merge branch 'beta' of github.com:dryswabbie/easyrtc into beta