qw
qw
Merge branch 'VladimirsBranch2'

Conflicts:
	TourPilot/src/isebase/cognito/tourpilot/Activity/UserRemarksActivity.java