Show chosen gametype in the map voting screen
Merge branch 'master' into disco_mode