jquery not strictly needed anymore
Merge branch 'master' into gh-pages
update