core.js
core.js re added
Merge branch 'master' into gh-pages