add link to faq on wiki
Merge branch 'develop'