Changes in electricity controller
Merge branch 'master' of https://github.com/leonard990/gsn-client