Navigation working
Merge branch 'master' of https://github.com/motasimhussain/FMS

Conflicts:
	application/controllers/site.php