Checkstyled the rest of game package. Trader through Universe.
Merge remote-tracking branch 'origin/master' into james/dev