Merge branch 'Lyberta/Survival' into Lyberta/master

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

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

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge

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

diff --cc qcsrc/common/wepent.qc
Simple merge

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

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

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

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

diff --cc xonotic-server.cfg
Simple merge