Merge branch 'pr/19'

Conflicts:
distribution/openhabhome/configurations/openhab_default.cfg