Merge branch 'gh-pages'
auto slideshow
Merge branch 'master' into gh-pages