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

Conflicts:
	application/controllers/user.php
2
Merged changes