fixed merge conflicts
fixed merge conflicts

berndpfrommer/openhab,tomtrath/openhab,berndpfrommer/openhab,foxy82/openhab,paolodenti/openhab,svenschreier/openhab,computergeek1507/openhab,craigham/openhab,jowi24/openhab,idserda/openhab,Gecko33/openhab,ShanksSGV/openhab,digitaldan/openhab,sitewhere/openhab,paolodenti/openhab,aschor/openhab,steve-bate/openhab,druciak/openhab,SwissKid/openhab,sitewhere/openhab,kaikreuzer/openhab,gilhmauy/openhab,digitaldan/openhab,lmaertin/openhab,kgoderis/openhab,Mixajlo/openhab,tomtrath/openhab,magcode/openhab,tdiekmann/openhab,sedstef/openhab,bakrus/openhab,ivanfmartinez/openhab,LaurensVanAcker/openhab,theoweiss/openhab,johkin/openhab,aruder77/openhab,computergeek1507/openhab,johkin/openhab,andreasgebauer/openhab,mvolaart/openhab,ssalonen/openhab,ollie-dev/openhab,mvolaart/openhab,JensErat/openhab,theoweiss/openhab,svenschaefer74/openhab,revenz/openhab,Gecko33/openhab,paolodenti/openhab,mdbergmann/openhab,gilhmauy/openhab,robbyb67/openhab,kreutpet/openhab,jowiho/openhab,coolweb/openhab,berndpfrommer/openhab,tomtrath/openhab,richbeales/openhab,evansj/openhab,teichsta/openhab,kgoderis/openhab,steve-bate/openhab,juri8/openhab,steintore/openhab,lmaertin/openhab,basriram/openhab,magcode/openhab,tomtrath/openhab,innoq/openhab,cesarmarinhorj/openhab,teichsta/openhab,xsnrg/openhab,Snickermicker/openhab,dvanherbergen/openhab,netwolfuk/openhab,abrenk/openhab,resetnow/openhab,holgercn/openhab,Snickermicker/openhab,theoweiss/openhab,eschava/openhab,netwolfuk/openhab,andrey-desman/openhab-hdl,starwarsfan/openhab,digitaldan/openhab,ollie-dev/openhab,mrguessed/openhab,lewie/openhab,coolweb/openhab,bakrus/openhab,PolymorhicCode/openhab,hmerk/openhab,beowulfe/openhab,teichsta/openhab,Snickermicker/openhab,andreasgebauer/openhab,marcelrv/openhab,hemantsangwan/openhab,andrey-desman/openhab-hdl,cyclingengineer/openhab,druciak/openhab,mjsolidarios/openhab,Jakey69/openhab,sja/openhab,LaurensVanAcker/openhab,mdbergmann/openhab,elifesy/openhab,ollie-dev/openhab,dfliess/openhab,g8kmh/openhab,johkin/openhab,basriram/openhab,cyclingengineer/openhab,teichsta/openhab,mash0304/openhab,TheOriginalAndrobot/openhab,kreutpet/openhab,computergeek1507/openhab,kaikreuzer/openhab,ollie-dev/openhab,CrackerStealth/openhab,JoeCob/openhab,juri8/openhab,SwissKid/openhab,ivanfmartinez/openhab,Gerguis/openhab2,georgwiltschek/openhab,clinique/openhab,jowiho/openhab,clinique/openhab,richbeales/openhab,clanko8285/openhab,marcelrv/openhab,sja/openhab,abrenk/openhab,smerschjohann/openhab,netwolfuk/openhab,Gerguis/open,aidanom1/openhab,MCherifiOSS/openhab,kgoderis/openhab,wep4you/openhab,paulianttila/openhab,PolymorhicCode/openhab,resetnow/openhab,theoweiss/openhab,Greblys/openhab,mdbergmann/openhab,aidanom1/openhab,robnielsen/openhab,xsnrg/openhab,wurtzel/openhab,ShanksSGV/openhab,clanko8285/openhab,robbyb67/openhab,JoeCob/openhab,marcelerkel/openhab,RafalLukawiecki/openhab1-addons,PlegmaLabs/openhab,sumnerboy12/openhab,PolymorhicCode/openhab,ShanksSGV/openhab,netwolfuk/openhab,berndpfrommer/openhab,marcelerkel/openhab,beowulfe/openhab,g8kmh/openhab,dvanherbergen/openhab,joek/openhab1-addons,juri8/openhab,CrackerStealth/openhab,elifesy/openhab,ssalonen/openhab,stefanroellin/openhab,computergeek1507/openhab,beowulfe/openhab,mroeckl/openhab,smerschjohann/openhab,dodger777/openhabMod,craigham/openhab,gernoteger/openhab_contributions,cyclingengineer/openhab,kuijp/openhab,cesarmarinhorj/openhab,digitaldan/openhab,mdbergmann/openhab,eschava/openhab,dbadia/openhab,mrguessed/openhab,steintore/openhab,docbender/openhab,sumnerboy12/openhab,g8kmh/openhab,gilhmauy/openhab,mattnl/openhab,Snickermicker/openhab,cslauritsen/openhab,georgwiltschek/openhab,dvanherbergen/openhab,robnielsen/openhab,paixaop/openhab,abrenk/openhab,berndpfrommer/openhab,cslauritsen/openhab,wuellueb/openhab,frami/openhab,rmayr/openhab,cdjackson/openhab,sumnerboy12/openhab,cvanorman/openhab,mrguessed/openhab,holgercn/openhab,taupinfada/openhab,theoweiss/openhab,dodger777/openhabMod,joek/openhab1-addons,mvolaart/openhab,watou/openhab,gerrieg/openhab,cschneider/openhab,dmize/openhab,querdenker2k/openhab,Gerguis/open,mash0304/openhab,PlegmaLabs/openhab,gunthor/openhab,svenschaefer74/openhab,hmerk/openhab,PolymorhicCode/openhab,maraszm/openhab,digitaldan/openhab,cesarmarinhorj/openhab,saydulk/openhab,mjsolidarios/openhab,Mike-Petersen/openhab,cschneider/openhab,QuailAutomation/openhab,bbesser/openhab1-addons,sumnerboy12/openhab,LaurensVanAcker/openhab,mattnl/openhab,wuellueb/openhab,Gerguis/open,stefanroellin/openhab,ivanfmartinez/openhab,dominicdesu/openhab,smerschjohann/openhab,saydulk/openhab,TheNetStriker/openhab,Gerguis/open,Jakey69/openhab,andrey-desman/openhab-hdl,TheOriginalAndrobot/openhab,paolodenti/openhab,paphko/openhab,steve-bate/openhab,Mixajlo/openhab,juri8/openhab,JoeCob/openhab,kbialek/openhab,gerrieg/openhab,JensErat/openhab,maraszm/openhab,gilhmauy/openhab,elifesy/openhab,swatchy2dot0/openhab,steintore/openhab,JoeCob/openhab,marcelrv/openhab,LaurensVanAcker/openhab,robnielsen/openhab,resetnow/openhab,kaikreuzer/openhab,digitaldan/openhab,steintore/openhab,jhonpaulrocha/openhabss,cesarmarinhorj/openhab,gernoteger/openhab_contributions,tarioch/openhab,cyclingengineer/openhab,lmaertin/openhab,seebag/openhab,cschneider/openhab,aidanom1/openhab,cschneider/openhab,craigham/openhab,AutoMates/openhab,Mixajlo/openhab,Greblys/openhab,cyclingengineer/openhab,g8kmh/openhab,AutoMates/openhab,fbeke/openhab,CondormanFr/openhab,mroeckl/openhab,ivanfmartinez/openhab,vgoldman/openhab,gernoteger/openhab_contributions,CondormanFr/openhab,paixaop/openhab,eschava/openhab,innoq/openhab,Gerguis/open,mash0304/openhab,ollie-dev/openhab,robnielsen/openhab,dfliess/openhab,watou/openhab,Greblys/openhab,jowi24/openhab,sytone/openhab,stefanroellin/openhab,TheNetStriker/openhab,mvolaart/openhab,andrey-desman/openhab-hdl,TheOriginalAndrobot/openhab,taimos/openhab,swatchy2dot0/openhab,seebag/openhab,sja/openhab,swatchy2dot0/openhab,robnielsen/openhab,mash0304/openhab,rmayr/openhab,wojtus/openhab,sitewhere/openhab,paixaop/openhab,paixaop/openhab,tomtrath/openhab,aruder77/openhab,dmize/openhab,mleegwt/openhab,sedstef/openhab,resetnow/openhab,Jakey69/openhab,juri8/openhab,svenschreier/openhab,xsnrg/openhab,beowulfe/openhab,QuailAutomation/openhab,tarioch/openhab,andrey-desman/openhab-hdl,Gerguis/openhab2,wep4you/openhab,dominicdesu/openhab,mjsolidarios/openhab,tarioch/openhab,sibbi77/openhab,mrguessed/openhab,abrenk/openhab,SwissKid/openhab,Gecko33/openhab,sytone/openhab,sytone/openhab,Jakey69/openhab,Mike-Petersen/openhab,craigham/openhab,paixaop/openhab,wuellueb/openhab,curtisstpierre/openhab,gunthor/openhab,sytone/openhab,clinique/openhab,cslauritsen/openhab,mdbergmann/openhab,PlegmaLabs/openhab,paolodenti/openhab,lmaertin/openhab,vgoldman/openhab,foxy82/openhab,falkena/openhab,georgwiltschek/openhab,falkena/openhab,curtisstpierre/openhab,AutoMates/openhab,joek/openhab1-addons,querdenker2k/openhab,jforge/openhab,cschneider/openhab,CondormanFr/openhab,docbender/openhab,aschor/openhab,gerrieg/openhab,abrenk/openhab,SwissKid/openhab,jowi24/openhab,gunthor/openhab,openhab/openhab,hemantsangwan/openhab,MitchSUEW/openhab,wurtzel/openhab,watou/openhab,querdenker2k/openhab,sja/openhab,ShanksSGV/openhab,smerschjohann/openhab,mleegwt/openhab,openhab/openhab,cdjackson/openhab,TheNetStriker/openhab,xsnrg/openhab,cschneider/openhab,paphko/openhab,bbesser/openhab1-addons,jforge/openhab,wurtzel/openhab,hmerk/openhab,sibbi77/openhab,RafalLukawiecki/openhab1-addons,curtisstpierre/openhab,savageautomate/openhab,foxy82/openhab,fbeke/openhab,TheOriginalAndrobot/openhab,tarioch/openhab,wep4you/openhab,mleegwt/openhab,taimos/openhab,maraszm/openhab,hemantsangwan/openhab,taupinfada/openhab,kuijp/openhab,cdjackson/openhab,elifesy/openhab,Mixajlo/openhab,bbesser/openhab1-addons,mattnl/openhab,AutoMates/openhab,teichsta/openhab,frami/openhab,steintore/openhab,jhonpaulrocha/openhabss,paphko/openhab,kbialek/openhab,aruder77/openhab,steve-bate/openhab,smerschjohann/openhab,RafalLukawiecki/openhab1-addons,georgwiltschek/openhab,cdjackson/openhab,johkin/openhab,revenz/openhab,TheNetStriker/openhab,sedstef/openhab,paixaop/openhab,kbialek/openhab,marcelerkel/openhab,teichsta/openhab,ShanksSGV/openhab,Greblys/openhab,querdenker2k/openhab,digitaldan/openhab,jowiho/openhab,Gecko33/openhab,rmayr/openhab,SwissKid/openhab,savageautomate/openhab,elifesy/openhab,paixaop/openhab,ssalonen/openhab,starwarsfan/openhab,johkin/openhab,evansj/openhab,kreutpet/openhab,svenschaefer74/openhab,foxy82/openhab,vgoldman/openhab,gernoteger/openhab_contributions,mroeckl/openhab,mroeckl/openhab,tdiekmann/openhab,Mike-Petersen/openhab,Jakey69/openhab,doubled-ca/openhab1-addons,paulianttila/openhab,sja/openhab,foxy82/openhab,Gecko33/openhab,jowiho/openhab,dbadia/openhab,rmayr/openhab,querdenker2k/openhab,lmaertin/openhab,revenz/openhab,dodger777/openhabMod,SwissKid/openhab,kaikreuzer/openhab,mleegwt/openhab,resetnow/openhab,Greblys/openhab,QuailAutomation/openhab,craigham/openhab,resetnow/openhab,coolweb/openhab,kgoderis/openhab,CondormanFr/openhab,g8kmh/openhab,xsnrg/openhab,gilhmauy/openhab,Snickermicker/openhab,sitewhere/openhab,swatchy2dot0/openhab,tarioch/openhab,g8kmh/openhab,wojtus/openhab,mjsolidarios/openhab,PlegmaLabs/openhab,gerrieg/openhab,elifesy/openhab,doubled-ca/openhab1-addons,andrey-desman/openhab-hdl,jowi24/openhab,hemantsangwan/openhab,CrackerStealth/openhab,smerschjohann/openhab,JoeCob/openhab,clinique/openhab,beowulfe/openhab,magcode/openhab,falkena/openhab,bakrus/openhab,theoweiss/openhab,QuailAutomation/openhab,MCherifiOSS/openhab,AutoMates/openhab,docbender/openhab,mroeckl/openhab,PlegmaLabs/openhab,JensErat/openhab,gunthor/openhab,ivanfmartinez/openhab,abrenk/openhab,savageautomate/openhab,rmayr/openhab,frami/openhab,holgercn/openhab,taimos/openhab,bakrus/openhab,frami/openhab,frami/openhab,Gerguis/openhab2,mattnl/openhab,wurtzel/openhab,dmize/openhab,cdjackson/openhab,evansj/openhab,MCherifiOSS/openhab,Gerguis/open,PlegmaLabs/openhab,TheOriginalAndrobot/openhab,Gecko33/openhab,openhab/openhab,curtisstpierre/openhab,cyclingengineer/openhab,lewie/openhab,watou/openhab,joek/openhab1-addons,Mike-Petersen/openhab,richbeales/openhab,LaurensVanAcker/openhab,TheOriginalAndrobot/openhab,peuter/openhab,docbender/openhab,MitchSUEW/openhab,georgwiltschek/openhab,kaikreuzer/openhab,jowiho/openhab,taupinfada/openhab,beowulfe/openhab,falkena/openhab,peuter/openhab,coolweb/openhab,wep4you/openhab,andreasgebauer/openhab,sytone/openhab,cvanorman/openhab,CrackerStealth/openhab,bbesser/openhab1-addons,swatchy2dot0/openhab,mrguessed/openhab,maraszm/openhab,holgercn/openhab,querdenker2k/openhab,idserda/openhab,sja/openhab,mattnl/openhab,dfliess/openhab,marcelrv/openhab,paphko/openhab,hmerk/openhab,andreasgebauer/openhab,peuter/openhab,Gerguis/openhab2,bakrus/openhab,cschneider/openhab,curtisstpierre/openhab,basriram/openhab,saydulk/openhab,docbender/openhab,wojtus/openhab,MitchSUEW/openhab,robbyb67/openhab,tarioch/openhab,JensErat/openhab,steve-bate/openhab,mleegwt/openhab,jowi24/openhab,swatchy2dot0/openhab,starwarsfan/openhab,lewie/openhab,wojtus/openhab,dominicdesu/openhab,svenschreier/openhab,clanko8285/openhab,robbyb67/openhab,robbyb67/openhab,peuter/openhab,savageautomate/openhab,MCherifiOSS/openhab,hmerk/openhab,jowi24/openhab,mvolaart/openhab,Jakey69/openhab,seebag/openhab,JoeCob/openhab,falkena/openhab,PolymorhicCode/openhab,jforge/openhab,innoq/openhab,Gerguis/openhab2,gernoteger/openhab_contributions,mroeckl/openhab,netwolfuk/openhab,ssalonen/openhab,jforge/openhab,dbadia/openhab,Snickermicker/openhab,JoeCob/openhab,sedstef/openhab,cslauritsen/openhab,frami/openhab,lewie/openhab,kreutpet/openhab,dmize/openhab,cesarmarinhorj/openhab,dodger777/openhabMod,peuter/openhab,doubled-ca/openhab1-addons,kgoderis/openhab,mleegwt/openhab,openhab/openhab,falkena/openhab,dmize/openhab,starwarsfan/openhab,cyclingengineer/openhab,foxy82/openhab,Jakey69/openhab,CondormanFr/openhab,eschava/openhab,TheNetStriker/openhab,jhonpaulrocha/openhabss,gerrieg/openhab,wuellueb/openhab,lewie/openhab,bakrus/openhab,docbender/openhab,abrenk/openhab,kuijp/openhab,idserda/openhab,paolodenti/openhab,richbeales/openhab,cslauritsen/openhab,tdiekmann/openhab,mleegwt/openhab,dfliess/openhab,vgoldman/openhab,jhonpaulrocha/openhabss,eschava/openhab,dbadia/openhab,mdbergmann/openhab,vgoldman/openhab,kbialek/openhab,Gerguis/open,cslauritsen/openhab,marcelrv/openhab,jowi24/openhab,mrguessed/openhab,jforge/openhab,aschor/openhab,wuellueb/openhab,svenschaefer74/openhab,resetnow/openhab,mdbergmann/openhab,watou/openhab,g8kmh/openhab,wurtzel/openhab,clinique/openhab,paulianttila/openhab,holgercn/openhab,dominicdesu/openhab,aschor/openhab,steintore/openhab,andreasgebauer/openhab,hemantsangwan/openhab,aidanom1/openhab,aidanom1/openhab,sibbi77/openhab,richbeales/openhab,JensErat/openhab,dodger777/openhabMod,gernoteger/openhab_contributions,ShanksSGV/openhab,ivanfmartinez/openhab,Gerguis/openhab2,fbeke/openhab,robnielsen/openhab,CondormanFr/openhab,revenz/openhab,elifesy/openhab,wep4you/openhab,RafalLukawiecki/openhab1-addons,coolweb/openhab,robbyb67/openhab,docbender/openhab,fbeke/openhab,cslauritsen/openhab,mattnl/openhab,saydulk/openhab,gunthor/openhab,mjsolidarios/openhab,revenz/openhab,teichsta/openhab,svenschaefer74/openhab,dodger777/openhabMod,coolweb/openhab,kuijp/openhab,eschava/openhab,andreasgebauer/openhab,jhonpaulrocha/openhabss,lmaertin/openhab,taimos/openhab,revenz/openhab,kgoderis/openhab,MitchSUEW/openhab,evansj/openhab,svenschreier/openhab,tdiekmann/openhab,stefanroellin/openhab,craigham/openhab,georgwiltschek/openhab,cschneider/openhab,mash0304/openhab,JensErat/openhab,clinique/openhab,georgwiltschek/openhab,Mike-Petersen/openhab,PolymorhicCode/openhab,maraszm/openhab,paulianttila/openhab,svenschaefer74/openhab,dfliess/openhab,kuijp/openhab,mjsolidarios/openhab,basriram/openhab,idserda/openhab,sibbi77/openhab,dbadia/openhab,mash0304/openhab,jforge/openhab,teichsta/openhab,gunthor/openhab,innoq/openhab,richbeales/openhab,dominicdesu/openhab,basriram/openhab,dbadia/openhab,kuijp/openhab,cvanorman/openhab,MCherifiOSS/openhab,mroeckl/openhab,saydulk/openhab,fbeke/openhab,QuailAutomation/openhab,bbesser/openhab1-addons,wojtus/openhab,sitewhere/openhab,curtisstpierre/openhab,fbeke/openhab,eschava/openhab,smerschjohann/openhab,tdiekmann/openhab,curtisstpierre/openhab,basriram/openhab,peuter/openhab,druciak/openhab,tomtrath/openhab,wuellueb/openhab,paphko/openhab,LaurensVanAcker/openhab,savageautomate/openhab,gernoteger/openhab_contributions,taimos/openhab,peuter/openhab,gunthor/openhab,jhonpaulrocha/openhabss,dodger777/openhabMod,mvolaart/openhab,evansj/openhab,marcelerkel/openhab,falkena/openhab,Mike-Petersen/openhab,taupinfada/openhab,johkin/openhab,saydulk/openhab,clanko8285/openhab,kbialek/openhab,sibbi77/openhab,Greblys/openhab,druciak/openhab,MCherifiOSS/openhab,tomtrath/openhab,doubled-ca/openhab1-addons,sibbi77/openhab,maraszm/openhab,kbialek/openhab,wep4you/openhab,paixaop/openhab,tomtrath/openhab,jforge/openhab,starwarsfan/openhab,rmayr/openhab,maraszm/openhab,digitaldan/openhab,steve-bate/openhab,magcode/openhab,kgoderis/openhab,CondormanFr/openhab,wurtzel/openhab,foxy82/openhab,kbialek/openhab,tdiekmann/openhab,sedstef/openhab,stefanroellin/openhab,jowiho/openhab,richbeales/openhab,marcelrv/openhab,PlegmaLabs/openhab,berndpfrommer/openhab,hmerk/openhab,gerrieg/openhab,starwarsfan/openhab,seebag/openhab,andreasgebauer/openhab,ssalonen/openhab,starwarsfan/openhab,ShanksSGV/openhab,mash0304/openhab,marcelrv/openhab,lewie/openhab,holgercn/openhab,svenschreier/openhab,coolweb/openhab,gilhmauy/openhab,saydulk/openhab,xsnrg/openhab,cvanorman/openhab,sytone/openhab,MitchSUEW/openhab,cvanorman/openhab,watou/openhab,savageautomate/openhab,aschor/openhab,aruder77/openhab,jhonpaulrocha/openhabss,dvanherbergen/openhab,taupinfada/openhab,PolymorhicCode/openhab,marcelerkel/openhab,sitewhere/openhab,svenschreier/openhab,CrackerStealth/openhab,clanko8285/openhab,lewie/openhab,TheNetStriker/openhab,dvanherbergen/openhab,dfliess/openhab,dfliess/openhab,RafalLukawiecki/openhab1-addons,druciak/openhab,computergeek1507/openhab,vgoldman/openhab,Mixajlo/openhab,magcode/openhab,AutoMates/openhab,aruder77/openhab,marcelerkel/openhab,aidanom1/openhab,computergeek1507/openhab,hemantsangwan/openhab,innoq/openhab,holgercn/openhab,idserda/openhab,evansj/openhab,openhab/openhab,joek/openhab1-addons,ssalonen/openhab,andrey-desman/openhab-hdl,wojtus/openhab,bakrus/openhab,doubled-ca/openhab1-addons,gilhmauy/openhab,johkin/openhab,clanko8285/openhab,robbyb67/openhab,cesarmarinhorj/openhab,cvanorman/openhab,RafalLukawiecki/openhab1-addons,Gecko33/openhab,sedstef/openhab,paphko/openhab,Greblys/openhab,aruder77/openhab,dmize/openhab,ollie-dev/openhab,fbeke/openhab,mjsolidarios/openhab,openhab/openhab,dominicdesu/openhab,MCherifiOSS/openhab,hemantsangwan/openhab,juri8/openhab,craigham/openhab,paulianttila/openhab,dvanherbergen/openhab,wojtus/openhab,watou/openhab,xsnrg/openhab,seebag/openhab,sumnerboy12/openhab,aschor/openhab,taimos/openhab,Gerguis/openhab2,MitchSUEW/openhab,clinique/openhab,Mixajlo/openhab,taupinfada/openhab,JensErat/openhab,stefanroellin/openhab,maraszm/openhab,wurtzel/openhab,juri8/openhab,cdjackson/openhab,idserda/openhab,mroeckl/openhab,bakrus/openhab,magcode/openhab,bbesser/openhab1-addons,taimos/openhab,paulianttila/openhab,MitchSUEW/openhab,kreutpet/openhab,aidanom1/openhab,doubled-ca/openhab1-addons,lmaertin/openhab,seebag/openhab,netwolfuk/openhab,CrackerStealth/openhab,cesarmarinhorj/openhab,stefanroellin/openhab,Mike-Petersen/openhab,sumnerboy12/openhab,revenz/openhab,robbyb67/openhab,marcelerkel/openhab,kreutpet/openhab,magcode/openhab,TheNetStriker/openhab,dodger777/openhabMod,innoq/openhab,sitewhere/openhab,AutoMates/openhab,AutoMates/openhab,sja/openhab,QuailAutomation/openhab,druciak/openhab,kaikreuzer/openhab,joek/openhab1-addons