Commit to pull
Solved conflicts
Fixed some logic error in WaitingRoom
Solved conflicts