add the search activity
fix conflict
Merge pull request #10 from weejulius/master

add the activity to search user