Fixed Encounters not working.
Fixed bug which prevented NPCs from spawning with equipment.
Combat changes compile. Needs to be hooked up, into the game.
Merge branch 'master' into sam/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/Encounter.java
	src/main/java/edu/gatech/gem5/game/Ship.java
	src/main/java/edu/gatech/gem5/game/controllers/DisplaySystemController.java
Cleaned up how Encounters with NPCs are handled.
Cleaned up how Encounters with NPCs are handled.
Cleaned up old comments
Removed unused method in Trader.