Merge pull request #231 from haedoang/feature/room-with-user

Merge pull request #231 from haedoang/feature/room-with-user #146