trash
add backup function
asda
asd
Merge branch 'VladimirsBranch'
small changes
qq
ff
trash
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/AndroidManifest.xml
	TourPilot/bin/AndroidManifest.xml
	TourPilot/bin/classes/.gitignore
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/BaseActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/CommentsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/DoctorsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/InfoActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ManualInputActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/SynchronizationActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ToursActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/PilotTour/PilotTourManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/TaskManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$id.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$layout.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$menu.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$style.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/AddTaskAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/EmploymentAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/TaskAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/WorkerAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Utils/DateUtils.class
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/res/values/strings.xml
	TourPilot/src/isebase/cognito/tourpilot/Activity/DoctorsActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/ToursActivity.java
trash
trash
trash
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/TaskManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Utils/DateUtils.class
trash
asdasd
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Employment/EmploymentManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/TaskManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/EmploymentAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Utils/DateUtils.class
	TourPilot/bin/resources.ap_
	TourPilot/res/layout/activity_patients.xml
	TourPilot/src/isebase/cognito/tourpilot/Data/Employment/EmploymentManager.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Task/TaskManager.java
	TourPilot/src/isebase/cognito/tourpilot/Templates/EmploymentAdapter.java
	TourPilot/src/isebase/cognito/tourpilot/Utils/DateUtils.java
asdasd
as
trash