change option layout and some activities
ss
34
fghhgf
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/Activity/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
	TourPilot/bin/resources.ap_
	TourPilot/res/layout/activity_options.xml
	TourPilot/src/isebase/cognito/tourpilot/Activity/OptionsActivity.java