Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

# Conflicts:
#	warphab/openhab/templates/warpzone.sitemap

warphab/openhab/templates/warpzone.sitemap

-sitemap demo label="wapzone Zonensteuerung" {
+sitemap demo label="Warpzone Zonensteuerung" {
     Frame label="Heizung" {
        Slider item=Temp_Lounge
        Text item=homematic_HG_BC_RT_TRX_CyN_9377c558_MEQ1776203_1_ACTUAL_TEMPERATURE  label="Current Temperature [%.1f °C]"
        Setpoint item=homematic_HG_BC_RT_TRX_CyN_9377c558_MEQ1776203_1_SET_TEMPERATURE minValue="10" maxValue="30" step="1"
-       Text item=HWerkstatt
+       Text item=EWerkstatt
        Slider item=Temp_EWerkstatt
     }
     Frame label="Heating" {