Add activity feed functonality
Merge branch 'public_activity' into development