ia openhab
Merge branch 'master' of https://github.com/samuel-gallet/Projet_fablab

Conflicts:
	openhab/distribution-runtime-1/configurations/items/demo.items
Merge branch 'master' of https://github.com/samuel-gallet/Projet_fablab
ia