parallel changes
Merge branch 'beta' of https://github.com/priologic/easyrtc into beta