Updates FAQ.
Merge branch 'development'