Made ready for master
Merge branch 'developing' of https://github.com/ZeeQyu/TileGame into developing