Merge branch 'action_queue' of github.com:Fit-Track/fittrack into front_end
Merge branch 'develop'
Merge branch 'develop'
Rebrad to Activity List
Update resource methods for update/delete
Merge branch 'front_end' of github.com:Fit-Track/fittrack into front_end