activity branch
Merge pull request #2 from Ebingo/activitybranck

activity branch