Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
adding google hosted .js
Merge branch 'gh-pages'