finish activity feature
Merge branch 'feature/add-activity' into develop