Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

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

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/wepent.qc
Simple merge

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

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

diff --cc xonotic-server.cfg
Simple merge