chris changes to FAQ
Merge branch 'hotfix_faq_type'