fix faq
Merge branch 'dev'