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

Conflicts:
	application/controllers/reports.php
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
Before merge with Seth
Merge branch 'master' of https://github.com/karsanrichard/HCMPv2
Potential Expiries Report changes
Expiries Graph fix