Merge branch 'master' into mirceakitsune/universal_reload_system

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

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