Multiplayer to MultiplayerMain

Fixing yet another one of Ben's mistakes.
Merge remote-tracking branch 'origin/master' into AndrewKenney