Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival

diff --cc balance-mario.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 qcsrc/common/t_items.qc
Simple merge

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

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

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

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

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