added properties to the room list
fixed a little bug
Merge remote-tracking branch 'origin/feature#45' into dev
Merge remote-tracking branch 'origin/dev' into dev