New secondary trigger for shotgun
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/weapons.qc