First draft for CityBuilder. Stable, raw UI.
Merge remote-tracking branch 'origin/master'