fixed broken tests, added city map
districts more than one square
Merge branch 'feature/citymap' into develop
fixed typo