Fix CityScene
Merge branch 'master' of https://github.com/Jank1310/advanced-ios-sta