link changes for nav bar
Merge branch 'master' into feature/navmenu
Merge branch 'master' into feature/navmenu