Added hotwater set point and diff
Merge branch 'develop'