Added lobby chat for all online players
Fixed merge conflict