Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/controllers/divisional_reports.php