Merge branch 'Annex60' of https://github.com/open-ideas/IDEAS into Annex60
delete HeatingSystems/Examples/Heating_Embedded_combiTES_DHW_STS.mo and its example because it is not used and it was not converted to the new A60
Merge remote-tracking branch 'damien/issue10_HeatingSystem' into damienpicard-issue10_HeatingSystem

Conflicts:
	IDEAS/HeatingSystems/Examples/Heating_Embedded_combiTES_DHW_STS.mo
	IDEAS/HeatingSystems/Heating_Embedded_combiTES_DHW_STS.mo
2 zones in the BuildingFreeFloat example