fixed faq page, added team page
Merge branch 'dev-tracy'