New changes
Merge branch 'master' of https://github.com/Mureithi/HCMP

Conflicts:
	application/controllers/report_management.php