Renamed models for Annex60 merge
Merged Annex branch issue39_idealHeaterCooler