Updated local multiplayer to master branch

updated master branch with 11 commits starting from "Added name display 30139c0"