fixed friend profiles
fixed friend profiles
fixed friend profiles
merge conflicts