new structure of IMCI
change to nav-logged-in
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch

Conflicts:
	application/modules/auth/controllers/auth.php
Admin Login