Cleaning continues
Merge https://github.com/h4wkmoon/xbmc-domoticz