refactor activity data structure
update organisation activity interface
Merge remote-tracking branch 'Git_LM/master' into master1