Merge branch 'master' into TimePath/csqc_sounds

# Conflicts:
#	qcsrc/client/main.qc
#	qcsrc/server/cl_player.qh

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

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

diff --cc qcsrc/lib/net.qh
Simple merge

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

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