merged master into gh-page
fixed js syntax error
Merge branch 'gh-page' into master
merged gh-page into master