adjustments of branch to updates from master
adjustments of branch to updates from master

architecture-building-systems/CityEnergyAnalyst,architecture-building-systems/CityEnergyAnalyst,architecture-building-systems/CityEnergyAnalyst