pull request commit
current room is now located in BanterDataModel
Merge remote-tracking branch 'origin/master'