Added shotgun. Needs tuning and indicator
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpectroPolarisClient/src/stkl/spectropolarisclient/Player.java