Fixed game lobby
merged changes