before pull
Merge branch 'master' of github.com:flashbac/samsung_Energy_watch

Conflicts:
	application/views/form/lineChart.php
fix