n
Commit
fix
users fix
tweek
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
Merge branch 'master' of https://github.com/Mureithi/HCMPv2
users
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/controllers/national.php
	application/controllers/user.php
	application/views/national/national_home_v.php
	system/libraries/Hcmp_functions.php