Merge branch 'master' into TimePath/deathtypes

# Conflicts:
#	qcsrc/common/util-pre.qh

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

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

diff --cc qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
Simple merge

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

diff --cc qcsrc/common/vehicles/sv_vehicles.qc
Simple merge

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

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

diff --cc qcsrc/server/mutators/mutator_buffs.qc
Simple merge

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

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