New
activation
test
Merge branch 'master' of https://github.com/Mureithi/HCMPv2

Conflicts:
	application/config/database.php fix