Checkstyle error fixes

About 300 of them
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/space/trader/GameUniverseScreenController.java