Develop faqs

ahorequested to merge
develop-faqs into master

Merge request reports