Merge branch 'Mario/cs_clientcvars' into 'master'

Merge branch Mario/cs_clientcvars (M merge request)

See merge request !458

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

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

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

diff --cc qcsrc/server/command/cmd.qc
Simple merge

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

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

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

diff --cc qcsrc/server/mutators/mutator/gamemode_ctf.qc
Simple merge

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

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge