Merge branch 'gh-pages' into develop
footer
更新词语细节
Merge branch 'develop' into gh-pages