Merge pull request #15 from andrewgtv/VladimirsBranch

Task classes, Activity.
Comment connection
Changes in Activities and in activity_tasks
Merge pull request #16 from andrewgtv/AndrewsConnectionBranch

Changes in Activities and in activity_tasks
add basic entities
Connection stuff
Merge pull request #18 from andrewgtv/AndrewsConnectionBranch

Connection stuff
Test merge
wetwet
asdasd
qwr
asdasd
11
merger options activity
merge 1
Bin commit
Option Activity
Conflicts resolved
Option Activity Conflict
Merge branch 'BogdansBranch' of ssh://git@github.com/andrewgtv/TourPilot.git into BogdansBranch