merged project
re implemented social activities