Merge remote branch 'origin/divVerent/crylink-joinspeed' into tzork/balance-tzork

diff --cc balance25.cfg
Simple merge

diff --cc balanceLeeStricklin.cfg
Simple merge

diff --cc balanceNexSVN.cfg
Simple merge

diff --cc balanceSamual.cfg
Simple merge

diff --cc balanceTest.cfg
Simple merge

diff --cc balanceXonotic.cfg
Simple merge

diff --cc balancetZork.cfg
Simple merge