123
Merge branch 'AndrewBranch'

Conflicts:
	TourPilot/bin/classes/.gitignore
	TourPilot/gen/.gitignore
asd
asdad
trash
trash
trash
trash
ццйку
qwewq
Delete AddTaskAdapter.class

delete
Delete AddTaskAdapter$AdditionalTasktHolder.class
trash
changes in manifest. set portrait to all activities
trash
Merge branch 'VladimirsBranch' of ssh://git@github.com/andrewgtv/TourPilot.git into VladimirsBranch
Merge branch 'master' into VladimirsBranch

Conflicts:
	TourPilot/.gitignore
	TourPilot/AndroidManifest.xml
	TourPilot/bin/AndroidManifest.xml
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/BaseActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/DoctorsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/NotesActivity.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/RelativesActivity.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.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Address/Address.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Doctor/Doctor.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Employment/EmploymentManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Patient/PatientManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Relative/Relative.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$dimen.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$drawable.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/AdditionalTaskAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/AddressAdapter.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/gen/isebase/cognito/tourpilot/R.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/OptionsActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Employment/EmploymentManager.java
trash
trash
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/resources.ap_
	TourPilot/res/layout/activity_synchronization.xml