Refactoring for release
Merge branch 'master' of https://github.com/csowada/openhab.git