Added FAQ page
Merge branch 'dev'