Organized imports
Fixed error on older jdk's
Merge branch 'master' of https://github.com/Druecilla/First-Person-Shooter