new attempt to resolv conflict
Merge branch 'master' of https://github.com/jit06/openhab

Conflicts:
	distribution/openhabhome/configurations/openhab_default.cfg