Merge branch 'jquery-addition'
Merge branch 'jquery-addition'
Merge branch 'master' into gh-pages