Merge branch 'master' into gh-pages
fixed story list
Merge branch 'gh-pages'