change room student, help SU check in code
Merge remote-tracking branch 'origin/master'