added live timeline feed
Merge branch 'activityfeed' with our master branch