Addition of SAP solar hot water and integration into openbem
Merge branch 'master' of https://github.com/emoncms/openbem

Conflicts:
	SimpleMonthly/Modules/waterheating/waterheating_controller.js
	SimpleMonthly/Modules/waterheating/waterheating_model.js
	SimpleMonthly/Modules/waterheating/waterheating_view.html
	SimpleMonthly/waterheating.php
	openbem_controller.php