fetch facebook friends
merge survey_answers branch to master and resolved conflict