bug fix energyCost
merge
Merge branch 'master' of https://github.com/biscmar/swisscom-IoT-gui