1
implement parser
222
Merge branch 'master' of https://github.com/andrewgtv/TourPilot

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObject.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Tour/Tour.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Worker/Worker.class
	TourPilot/bin/resources.ap_
	TourPilot/src/isebase/cognito/tourpilot/Data/Patient/Patient.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Worker/Worker.java