hilfe fix
Merge branch 'master' of https://github.com/flashbac/samsung_Energy_watch

Conflicts:
	application/views/hilfe.php
Merge branch 'master' of https://github.com/flashbac/samsung_Energy_watch

Conflicts:
	application/views/hilfe.php