change order of pages and external links, external links are now displayed after pages
fix broken config
Merge branch 'master' into gh-pages