events feed implemented
Merge branch 'activity_stream'