Changes in Activities and in activity_tasks
Merge pull request #16 from andrewgtv/AndrewsConnectionBranch

Changes in Activities and in activity_tasks