report fixes to make national dashboard work
f
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live

Conflicts:

	system/libraries/Hcmp_functions.php