merge from testing
Merge branch 'working_version' of https://github.com/kreutpet/stiebelheatpump into working_version

Conflicts:
	org.stiebelheatpump/src/main/org/stiebelheatpump/protocol/Requests.java
	org.stiebelheatpump/src/main/resources/2.06.xml