Fix monster waypoint drawing at spawn-point after monster dies
Use a hack to remove dropped items on pickup
Add a check just incase the mutator deletes the item entity
Merge branch 'master' into Mario/monsters
Don't reduce owner's monster count if the monster is re-spawning
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
	qcsrc/client/hook.qc
	qcsrc/common/constants.qh
	qcsrc/common/weapons/w_electro.qc
	qcsrc/common/weapons/w_fireball.qc
	qcsrc/common/weapons/w_seeker.qc
	qcsrc/common/weapons/w_shockwave.qc
	qcsrc/common/weapons/weapons.qh
	qcsrc/server/cl_weapons.qc
	qcsrc/server/defs.qh
	qcsrc/server/miscfunctions.qc
	qcsrc/server/mutators/gamemode_nexball.qc
	qcsrc/server/t_items.qc
	qcsrc/server/tturrets/units/unit_walker.qc
	qcsrc/server/w_crylink.qc
	qcsrc/server/w_grenadelauncher.qc
	qcsrc/server/w_hagar.qc
	qcsrc/server/w_hlac.qc
	qcsrc/server/w_hook.qc
	qcsrc/server/w_laser.qc
	qcsrc/server/w_minelayer.qc
	qcsrc/server/w_minstanex.qc
	qcsrc/server/w_nex.qc
	qcsrc/server/w_rifle.qc
	qcsrc/server/w_rocketlauncher.qc
	qcsrc/server/w_uzi.qc
	qcsrc/server/weapons/tracing.qc
	qcsrc/server/weapons/weaponsystem.qc
Start renaming Shotgun to Shockwave and cleaning up code
Move overkill's spawn system into a separate mutator
Merge spawnsystem into the existing mutator
More work on Shockwave/Blaster cleanup
Working on adding orthoview feature for map screenshots from above
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
	qcsrc/common/weapons/w_tuba.qc
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
	qcsrc/common/weapons/w_fireball.qc
	qcsrc/server/w_crylink.qc
	qcsrc/server/w_grenadelauncher.qc
	qcsrc/server/w_minelayer.qc
	qcsrc/server/w_rocketlauncher.qc
Allow a smaller Electro comboradius for triggering through walls (plays better)
Merge remote-tracking branch 'origin/master' into samual/orthoview
Merge remote-tracking branch 'origin/master' into samual/orthoview
Clean up orthoview maths, add logic for handling r_nearclip and r_farclip
Fix it so that fov adjusts properly too
Use center of world bbox instead of '0 0 0' origin, solves a bug :D
On second thought, keep the override cvar