Merge branch 'master' of ssh://git@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/DataBase/DataBaseWrapper.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$style.class
	TourPilot/bin/resources.ap_
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/res/values/strings.xml
	TourPilot/src/isebase/cognito/tourpilot/Activity/OptionsActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Connection/ConnectionAsyncTask.java
	TourPilot/src/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.java
h
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git
small changes in connection
Vladimirs changes
new Vladimirs Activities
classes
Merge branch 'master' into VladimirsBranch

Conflicts:
	TourPilot/AndroidManifest.xml
	TourPilot/bin/AndroidManifest.xml
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.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/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/resources.ap_
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/res/values/strings.xml
change add to save
changes in additional tasks + catalogs
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git
fix
add catalog
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
Merge branch 'VladimirsBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/src/isebase/cognito/tourpilot/Data/BaseObject/BaseObject.java
	TourPilot/src/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Option/Option.java
merge with Vladimir
merging