…neState-of-ThermalHouse' into df/tmpHPmergeall

…ageResults-have-multiple-entries' into df/tmpHPmergeall

# Conflicts:
#	CHANGELOG.md

…ion-of-Hp-when-not-under-control-of-an-EM' into df/tmpHPmergeall

# Conflicts:
#	CHANGELOG.md

…ermalGird-energyDemand' into df/tmpHPmergeall

…ge correctly when empty

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

…refactor-handleInfeed

This reverts commit a669b5b.

This reverts commit bfd633b.

… class

…handleInfeed

# Conflicts:
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala

# Conflicts:
#	CHANGELOG.md

…nning in the last state

# Conflicts:
#	CHANGELOG.md

…efactor-handleInfeed

# Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala