Changes lots of stuff (such a descriptive commit message :D)
Plz fixed merge conflicts?
Merge branch 'master' of https://github.com/SurvivalGamesDevTeam/TheSurvivalGames