Merge pull request #1 from Ebingo/testBranck

Test branck
Merge pull request #2 from Ebingo/activitybranck

activity branch
Merge pull request #3 from Ebingo/activitybranck

activity branch
Merge remote-tracking branch 'remotes/origin/master' into activitybranck