Merge branch 'master' into gh-pages
add jquery 1.8.3
Merge branch 'gh-pages'