Some activity charts tweaks
Merge friends with remote friends