energie meter gefixed
Merge branch 'feature/bugfix_energie_meter' into