fixes #18
Merge branch 'bug/18-no-staff-activity' into dev