Realized I have to fix the links to the js as well.
Merge branch 'develop' into gh-pages