HighScore
Merge remote-tracking branch 'origin/master' into VidarBranch
pickUpWeapon bug fix, controller update 45/s
Merge remote-tracking branch 'origin/master' into LinusBranch