Fixed bugg in addToRoom()
Merge remote-tracking branch 'origin/peralbin' into peralbin