Merge remote branch 'origin/master' into fruitiex/balance

diff --cc balance25.cfg
Simple merge

diff --cc balanceLeeStricklin.cfg
Simple merge

diff --cc balanceSamual.cfg
Simple merge

diff --cc balanceXonotic.cfg
Simple merge

diff --cc balancetZork.cfg
Simple merge

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/g_damage.qc
Simple merge