javadoccing/checkstyle - Hutchinson
Merge origin/M7 into M9

Conflicts:
	SpaceTrader/src/spacetrader/Character.java
	SpaceTrader/src/spacetrader/Inventory.java
	SpaceTrader/src/spacetrader/Market.java
	SpaceTrader/src/spacetrader/Planet.java
	SpaceTrader/src/spacetrader/Ship.java
	SpaceTrader/src/spacetrader/ShipYard.java
	SpaceTrader/src/spacetrader/Ships.java
	SpaceTrader/src/spacetrader/SolarSystem.java
	SpaceTrader/src/spacetrader/TravelEvent.java
	SpaceTrader/src/spacetrader/Universe.java
	SpaceTrader/src/spacetrader/UniverseController.java



**Fixed all conflicts with javadoccing/checkstyle - Hutchinson
Merge origin/M9 into M9

Conflicts:
	SpaceTrader/src/spacetrader/Inventory.java

***Fixed conflicts - Hutchinson