commentaires
Merge branch 'master' of https://github.com/cmdalbem/SmartClass

Conflicts:
	openhab-runtime-1.3.1/configurations/rules/demo.rules