PMD, Checkstyle, and FixBugs
Merge origin/master

Conflicts:
	dist/SpaceTraders2.html
	dist/SpaceTraders2.jar
	dist/SpaceTraders2.jnlp