Updated Javadocs
Merge branch 'master' of https://github.com/linalana/ProgrammingPirates

Conflicts:
	SpaceTrader/src/spacetrader/engine/ShieldsController.java
	SpaceTrader/src/spacetrader/engine/ShipMarketController.java
	SpaceTrader/src/spacetrader/engine/ShipUpgradeController.java
	SpaceTrader/src/spacetrader/engine/WeaponsController.java
	SpaceTrader/src/spacetrader/model/Turn.java