added search for contacts
Merge conflicts