date updated
Merge branch 'jquery' into gh-pages