alles
Behoben
Merge branch 'master' of github.com:flashbac/samsung_Energy_watch

Conflicts:
	application/controllers/main.php
	application/views/navigation.php