Added navigation code.
Merge branch 'master' of https://github.com/ipsitg-optimus/TeamProject