1
Merge branch 'VladimirsBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/Tasks/StandardTaskDialog$3.class