* Upgrade to openHAB 1.3.1
* Some refactoring