Fix nav controller
Merge pull request #44 from amitburst/navctrl

Fix nav controller
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop