added mentor search
updated with full profile activity
commit before merge
resolved merge conflict
merged code