adaa
Tour info, patient info
yyt
ii
q
add tour info
trash
xx
t
change in toursactvity + taskactoivoty
ss
trash
Manual input and Employment intervals
1
12
1
1
1
1
Merge branch 'AndrewBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Address/Address.class