Merge branch 'master' into gh-pages
Thursday Commit 2

Fixed JAvaScript Error
Merge branch 'gh-pages'