Added activity info
Merge branch 'activity'
Merge branch 'master' of https://github.com/JesseyH/test