Merge remote branch 'origin/fruitiex/fruit_vs_tzork-balance'

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/constants.qh
Simple merge

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

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

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