search for friends by email, search for friends by city
Merge branch 'master' into searchlists3
Merge branch 'searchlists3'
merging search friends