fix for line calculation
Merge branch 'master' of https://github.com/sonopard/PowerCounter

Conflicts:
	raspi/src/PC4004B.py
fixed in-method parameters
Initializing text now on line1
added exception handling for overall stats service
syntax fix
line fix
added loop for display wattage updater
disabled import bean
introduced WattageCaclulatorUtil
Merge branch 'master' of https://github.com/sonopard/PowerCounter

Conflicts:
	raspi/src/ppm.py
import wiederhergestellt