Merge pull request #10 from KevinMarete/master

fixed reports
Changes in data entry
Merge branch 'master' of https://github.com/jgat2012/ADVANTECH

Conflicts:
	application/modules/report/controllers/report.php
	application/modules/report/views/report_view.php
	assets/modules/report.js