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