Checkstyle stuff

Fixed universe gamedata spacefx controller
Merge remote-tracking branch 'origin/master'