Merge branch 'master' into terencehill/centerprint_stuff

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

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

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

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

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

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

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

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

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

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