update
Merge branch 'accordion' into gh-pages