More work on ZWaveGate
merge
git pushMerge branch 'RewriteStructure' of github.com:Z-Wave-Me/home-automation into RewriteStructure