navigation update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/gestion5/includes.php
	application/gestion5/layouts/DefaultLayout.php