Merge branch 'master' into martin-t/okc3

diff --cc balance-mario.cfg
Simple merge

diff --cc balance-nexuiz25.cfg
Simple merge

diff --cc balance-overkill.cfg
Simple merge

diff --cc balance-samual.cfg
Simple merge

diff --cc balance-xdf.cfg
Simple merge

diff --cc balance-xonotic.cfg
Simple merge

diff --cc balance-xpm.cfg
Simple merge

diff --cc defaultServer.cfg
Simple merge

diff --cc mutators.cfg
Simple merge

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