New changes
merger
menu items
Sub menu prt1
part 2
Merge branch 'master' of https://github.com/Mureithi/HCMPv2

Conflicts:
	application/controllers/user.php