Fixing enocean not working
Merge branch 'local' into test
Merge branch 'master' of https://github.com/appsgate2015/appsgate into test
Merge branch 'master' of https://github.com/appsgate2015/appsgate into test