Fix timeline and acticity
Merge pull request #379 from liuchuangww/user

Fix timeline and acticity