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.
Buying and selling ships now works properly
Combat now works against Traders and Pirates. Can also leave after finished.
Added Pirate Controllers.
A planet with no ships for sale will have the shipyard button deactivated.
Disabled the shipyard button instead of removing it if the planet has no ships for sale
Skeleton code for event parsers, not hooked up to the game yet.
Added checkstyle to the build. If you still want the project to build ignoring checkstyle errors, use gradle -x check. Also, There are a few modules that I commented out because the checkstyle from maven doesn't know them.
Merge branch 'master' into jack/dev
Merge branch 'master' into sam/dev
Added methods to Ship to add weapons, shields, and gadgets, if there's room.
Added methods to add weapons, shields, gadgets to ships.
Started working towards deprecating LastAdventures.swap().
Added Ship methods to find available slots for weapons, shields, gadgets.