Merge remote-tracking branch 'origin/fruitiex/fix_slap'

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 qcsrc/server/autocvars.qh
Simple merge