Fixed possible bugs
Merge branch 'feature/TiledMapLoader' of https://github.com/Team-Innis/UtH-Engine into feature/TiledMapLoader