ui-nav dev
nav-menu and bug fixes
Merge pull request #15 from shawnsandy/develop

Develop