fixed bug in emit
Merge branch 'bleeding-edge' of github.com:Z-Wave-Me/home-automation into bleeding-edge