trash
trash
trash
trash
Merge branch 'BogdansBranch' of ssh://git@github.com/andrewgtv/TourPilot.git into BogdansBranch
trashxx
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/dexedLibs/android-support-v4-1911576849660653e459537ca11a7964.jar
	TourPilot/bin/resources.ap_
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/dexedLibs/android-support-v4-1911576849660653e459537ca11a7964.jar
	TourPilot/bin/resources.ap_
Merge branch 'BogdansBranch' of
ssh://git@github.com/andrewgtv/TourPilot.git into BogdansBranch
add dialogs dor additiona tasks
trash
trash
trash
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/AndroidManifest.xml
	TourPilot/bin/AndroidManifest.xml
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/Task.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.class
	TourPilot/bin/dexedLibs/android-support-v4-62017e20ede376f7e8ab22df18c7ffdc.jar
	TourPilot/bin/resources.ap_
changes in addresses, changes in parsing task, changes in additional
task
add base dialog
trash
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
trash
changes in strings