Merging the FindDueActivityForFriend 

It is time to merge the FindDueActivityForFriend towards the master, It works as off now although it could use some work