Merge branch 'gh-pages'
changed theme page.html
Merge branch 'master' into gh-pages