Merge remote-tracking branch 'origin/Juhu/strafehud-next_cvarsave' into morosophos...

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-nexuiz25.cfg
Simple merge

diff --cc bal-wep-samual.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

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

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