Activity stream fixes and grouping of timeline activities
Merge pull request #193 from saumishr/master

Activity stream fixes and grouping of timeline activities