cleaned stable branch (nothing is stable)
Merge branch 'develop' of https://www.github.com/DrVonTrap/CityProject into develop