Moved the core js so having to fix paths
Merge branch 'master' into gh-pages