Merge branch 'master' into DefaultUser/armormega

# Conflicts:
#	mutators.cfg
#	qcsrc/common/mutators/mutator/nix/sv_nix.qc

diff --cc _hud_common.cfg
Simple merge

diff --cc mutators.cfg
Simple merge

diff --cc qcsrc/common/items/item/armor.qh
Simple merge

diff --cc qcsrc/common/items/item/health.qh
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Simple merge

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