Merge pull request #16 from andrewgtv/AndrewsConnectionBranch

Changes in Activities and in activity_tasks
add basic entities
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
Merge branch 'AndrewsConnectionBranch'

Conflicts:
	TourPilot/.gitignore
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
q
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/resources.ap_
DB changes