Merge branch 'develop' into DependencyUpdate

Conflicts:
	CMakeLists.txt
	openstudiocore/ProjectMacros.cmake
	openstudiocore/src/contam/ForwardTranslator.cpp
	openstudiocore/src/energyplus/ForwardTranslator.cpp
	openstudiocore/src/energyplus/ReverseTranslator/ReverseTranslateShadingBuildingDetailed.cpp
	openstudiocore/src/energyplus/ReverseTranslator/ReverseTranslateShadingSiteDetailed.cpp
	openstudiocore/src/isomodel/ForwardTranslator.cpp
	openstudiocore/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam.cpp
	openstudiocore/src/model/AirTerminalSingleDuctConstantVolumeReheat.cpp
	openstudiocore/src/model/AirTerminalSingleDuctParallelPIUReheat.cpp
	openstudiocore/src/model/AirTerminalSingleDuctUncontrolled.cpp
	openstudiocore/src/model/AirTerminalSingleDuctVAVNoReheat.cpp
	openstudiocore/src/model/AirTerminalSingleDuctVAVReheat.cpp
	openstudiocore/src/model/Building.cpp
	openstudiocore/src/model/Construction.cpp
	openstudiocore/src/model/ConstructionWithInternalSource.cpp
	openstudiocore/src/model/Facility.cpp
	openstudiocore/src/model/HVACComponent.cpp
	openstudiocore/src/model/LifeCycleCost.cpp
	openstudiocore/src/model/Model.cpp
	openstudiocore/src/model/ModelObject.cpp
	openstudiocore/src/model/Site.cpp
	openstudiocore/src/model/SpaceType.cpp
	openstudiocore/src/model/UtilityBill.cpp
	openstudiocore/src/model/YearDescription.cpp
	openstudiocore/src/model/ZoneHVACBaseboardConvectiveElectric.cpp
	openstudiocore/src/model/ZoneHVACBaseboardConvectiveWater.cpp
	openstudiocore/src/model/ZoneHVACComponent.cpp
	openstudiocore/src/model/ZoneHVACLowTempRadiantConstFlow.cpp
	openstudiocore/src/model/ZoneHVACLowTempRadiantVarFlow.cpp
	openstudiocore/src/model/ZoneHVACLowTemperatureRadiantElectric.cpp
	openstudiocore/src/openstudio_lib/BuildingStoriesController.cpp
	openstudiocore/src/openstudio_lib/BuildingStoryInspectorView.cpp
	openstudiocore/src/openstudio_lib/LocationTabView.cpp
	openstudiocore/src/openstudio_lib/ModelObjectTreeItems.cpp
	openstudiocore/src/openstudio_lib/RefrigerationController.cpp
	openstudiocore/src/openstudio_lib/SpaceInspectorView.cpp
	openstudiocore/src/openstudio_lib/SpaceLoadInstancesWidget.cpp
	openstudiocore/src/openstudio_lib/SpaceTypeInspectorView.cpp
	openstudiocore/src/openstudio_lib/SpaceTypesController.cpp
	openstudiocore/src/openstudio_lib/ThermalZonesController.cpp
	openstudiocore/src/openstudio_lib/VariablesTabView.cpp
	openstudiocore/src/osversion/VersionTranslator.cpp
	openstudiocore/src/radiance/ForwardTranslator.cpp
	openstudiocore/src/runmanager/lib/ModelToRadPreProcessJob.cpp
	openstudiocore/src/runmanager/lib/RunManager.cpp
	openstudiocore/src/sdd/ForwardTranslator.cpp
	openstudiocore/src/sdd/MapGeometry.cpp
	openstudiocore/src/utilities/idf/IdfObject.cpp
	openstudiocore/src/utilities/idf/Workspace.cpp
	openstudiocore/src/utilities/idf/WorkspaceObject.cpp