qw
qwq
Merge branch 'VladimirsBranch2'

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/UserRemarksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$style.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/AddressAdapter.class
	TourPilot/bin/dexedLibs/android-support-v4-66907884160295af8db0379bc65d05de.jar
	TourPilot/bin/dexedLibs/android-support-v4-705ea5a8f2e07270cc92365781419b46.jar
	TourPilot/bin/resources.ap_
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/res/values/strings.xml
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/UserRemarksActivity.java
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git