Merge branch 'master' into Lyberta/WaypointIcons

diff --cc qcsrc/common/items/item.qh
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/items/item/jetpack.qh
Simple merge

diff --cc qcsrc/common/mutators/mutator/instagib/items.qh
Simple merge

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