1
1
1
1
Merge branch 'VladimirsBranch2'

Conflicts:
	TourPilot/src/isebase/cognito/tourpilot/Activity/VerificationActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/Tasks/BlutdruckTaskDialog.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/Tasks/StandardTaskDialog.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/Tasks/TaskDialogTypes.java