Demo mode now downloads and hosts the correct files.
Fixed another directory bug.
Merge remote-tracking branch 'origin/master'