Fixed javadocVariableCheck errors

wow such checkstyle
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/space/trader/CharacterCreationController.java
	src/space/trader/GameUniverseScreenController.java
	src/space/trader/Item.java
	src/space/trader/PirateEncounterScreenController.java
	src/space/trader/Planet.java
	src/space/trader/PoliceEncounterScreenController.java
	src/space/trader/Shield.java
	src/space/trader/Ship.java
	src/space/trader/StartScreenController.java
	src/space/trader/TraderEncounterScreenController.java
	src/space/trader/Universe.java
	src/space/trader/UpgradeShipScreenController.java
	src/space/trader/Weapon.java
	test/space/trader/BuyTest.java
	test/space/trader/MarketPlaceTest.java