Finished CheckStyles and PMD for EncounterController.
Fixed some small typos
Did Checkstyles and PMD on GameCreationController
Did Checkstyles and PMD on LaunchScreenController
Added small comment
Did Checkstyles and PMD for MapController. Note: magic numbers remains as an issue
Fixed problems with encounteree due to Checkstyle changes - i.e. with static assignments
Getter for encounteree is now static
Merge origin/master

Conflicts:
	src/controllers/SpaceTradersController.java