updated nav
"updated nav"Merge branch 'master' into gh-pages