Merge branch 'lobby' into develop

Implement Lobby feature.

Fixes #31