Merge branch 'myrtc' of http://192.168.0.115:3000/xushiting/Metaverse into myrtc

# Conflicts:
#	src/main.js