New Watteco implementation
Merge branch 'master' of https://github.com/cegerard/appsGate-server