Powerups won't add guns that are already there
Merge branch 'master' of ssh://git@github.com/rubil4x/cmsc425.git

Conflicts:
	CMSC425/res/content/test_chain.chaindefinition
	CMSC425/res/content/test_cos.sinmotionbehaviordefinition
	CMSC425/res/content/units/grunt/grunt.unitdefinition
	CMSC425/src/com/piss/probe/content/world/objects/PlayerSlaveUnitDefinition.java
	CMSC425/src/com/piss/probe/game/model/world/objects/PowerupInstance.java
just fixing merge artifacts