Annex60 sync

Merge the new heater and cooler model from the Annex 60 library.