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

Conflicts:
	application/views/form/chart2.php