Separate netcode and menu code
Merge branch 'master' into bobby