Merge remote branch 'origin/master' into samual/new_shotgun_tracing

diff --cc balance25.cfg
Simple merge

diff --cc balanceFruit.cfg
Simple merge

diff --cc balanceLeeStricklin.cfg
Simple merge

diff --cc balanceXonotic.cfg
Simple merge

diff --cc balancetZork.cfg
Simple merge