small changes
Merge branch 'people_activity' into testing