steg 5
Merge branch 'task-activity-manager' of github.com:ActivityRez/ar-framework into task-activity-manager