add activity id in local data
Merge remote-tracking branch 'Git_LM/master' into master1
update activity display