edit / update changes to activities controller
Merge branch 'master' of https://github.com/jackjeffress/activityfinder