Updated version of FAQ page
retry merge of caitlin and matt on test branch