Update Engimusing Openhab branch

This should bring the Engimusing branch upto date with the openhab master branch