trash
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/AddressAdapter.class