1.0.6.g update

Update for RestartMap by players. Also fix for matchRestart in Match.