remove nav templates and add routes
Merge branch 'master' into gh-pages
update dist