aa
Merge branch 'master' into AndrewsBuisnessClasesBranch

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/resources.ap_
Tasks activity
add pnjs
123
Merge branch 'master' into AndrewsBuisnessClasesBranch

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/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$menu.class
	TourPilot/bin/resources.ap_
	TourPilot/src/isebase/cognito/tourpilot/Activity/WorkersActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.java
images
321
asas
new checkboxes
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/Data/Option/Option.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.class
	TourPilot/bin/resources.ap_
Merge branch 'master' into AndrewBranch