Merge branch 'hot-fix-1.0.4'
完善faq和catalogue
Merge branch 'hotfix-1.0.5' into develop