Updated FAQ
Merge branch 'dev'