displaying common friends fixes, messages
merging changes