Forgot to put back /js for JS files
Merge branch 'master' into gh-pages