updated nav links
Merge branch 'master' into development