Merge remote-tracking branch 'origin/master'

init virtual class room.
Merge remote-tracking branch 'origin/master' into newmaster