Fixed /demo/ refs
Merge branch 'als-working' into gh-pages