added friend search table
merged branch1