change faq content
Merge branch 'master' into production