New National
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
user fix
err
user quick fix
Merge branch 'master' of https://github.com/Mureithi/HCMPv2
user creation fix
New
activation
test
users fix
Merge branch 'master' of https://github.com/Mureithi/HCMPv2

Conflicts:
	application/config/database.php fix
git ignore
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2 into develop

Conflicts:
	application/config/database.php