implemented FriendRecentActivity
merging
merging again