Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load

diff --cc balance25.cfg
Simple merge

diff --cc balanceLeeStricklin.cfg
Simple merge

diff --cc balanceSamual.cfg
Simple merge

diff --cc balanceXonotic.cfg
Simple merge

diff --cc balancetZork.cfg
Simple merge

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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

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

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

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

diff --cc xonotic-credits.txt
Simple merge