ghjghj
Merge branch 'VladimirsBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
Merge branch 'VladimirsBranch'

Conflicts:
	TourPilot/bin/classes/.gitignore
Merge branch 'master' into VladimirsBranch
ss