updated activity
Merge branch 'develop' of github.com:mashine-hq/gensherman into develop