Merge pull request #277 from fgiannar/develop

energy in KWh not J
Exception removed from Issue #274
Merge branch 'develop' of https://github.com/cassandra-project/platform into develop
Merge pull request #63 from cassandra-project/develop

get updates