Lobby controller - waiting room
Merge commit '0ae9b1f915176951dff7c9a39cd4f47104245df8'