ZAutomation finalization (Greg)
Merge branch 'develop' of github.com:Z-Wave-Me/home-automation into develop