Restore demo files (from commit just before they were removed from this repo)
Fix the global navigation URL (via sed)
Reproduce and fix #378
Merge branch 'demo'