updated minified file
Merge branch 'master' into gh-pages
updated to minified file