Fixed some issues with starting new game in client controller / server controller
Merge fix
Fix merge conflict