quick fixes
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
fix
reports
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/controllers/reports.php
quick fix from the meeting
fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/config/database.php
 f
new changes
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
removed
scroll
fix exp date
hot fix
hot fix
q
hot fix
county fix
Merging branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	.htaccess
	application/controllers/reports.php
	application/views/facility/facility_reports/ajax/facility_expiry_filter_v.php