Merge branch 'master' into TimePath/notifications

# Conflicts:
#	qcsrc/common/mutators/mutator/overkill/hmg.qc
#	qcsrc/common/mutators/mutator/overkill/rpc.qc
#	qcsrc/common/weapons/weapon/arc.qc
#	qcsrc/common/weapons/weapon/blaster.qc
#	qcsrc/common/weapons/weapon/crylink.qc
#	qcsrc/common/weapons/weapon/devastator.qc
#	qcsrc/common/weapons/weapon/electro.qc
#	qcsrc/common/weapons/weapon/fireball.qc
#	qcsrc/common/weapons/weapon/hagar.qc
#	qcsrc/common/weapons/weapon/hlac.qc
#	qcsrc/common/weapons/weapon/hook.qc
#	qcsrc/common/weapons/weapon/machinegun.qc
#	qcsrc/common/weapons/weapon/minelayer.qc
#	qcsrc/common/weapons/weapon/mortar.qc
#	qcsrc/common/weapons/weapon/rifle.qc
#	qcsrc/common/weapons/weapon/seeker.qc
#	qcsrc/common/weapons/weapon/shockwave.qc
#	qcsrc/common/weapons/weapon/shotgun.qc
#	qcsrc/common/weapons/weapon/vaporizer.qc
#	qcsrc/common/weapons/weapon/vortex.qc