New advanced search and ajax contact list
Fix conflicts