Some changes to gamestatemanager
Merge branch 'master' of https://github.com/destiny14/toytanfall