City building placement
city assets buildings
Merge branch 'master' into DesignTeam