the activityList is finished
Merge pull request #15 from Narcssus/master

the activityList is finished