changes in weapons sprite
Merge remote-tracking branch 'origin/master'

Conflicts:
	zed-reboot.userprefs