edit activity
Merge branch 'master' of github.com:dethbird/tracker-api