Merge remote-tracking branch 'origin/Mario/nexball_updates'

* origin/Mario/nexball_updates:
  Add an option to always show 3rd person view in nexball while not carrying weapons, show a waypoint at the enemy's goal so players know where to take the ball, fix nexball showing up as a modification rather than a gamemode