Fix the page template.
Fix URL in various href and src attributes.
Merge branch 'master' into gh-pages