updates FAQ
Merge branch 'develop'

* develop:
  updates FAQ