added find user by contacts to who to view page; added ability to add phone number at signup and in edit profile page
Merge branch 'July27'
added reporting functionality; work on settings page
Merge remote-tracking branch 'origin/master'
Merge branch 'July28'
merged with Danielle changes; added reporting functionality; work on settings page;