diagnose information
wqw
trash
Merge branch 'master' into VladimirsBranch

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/ToursActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$style.class
	TourPilot/bin/dexedLibs/android-support-v4-62017e20ede376f7e8ab22df18c7ffdc.jar
	TourPilot/bin/resources.ap_
	TourPilot/res/layout/row_address_template.xml
	TourPilot/res/menu/tasks.xml
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java
changesd in diagnioses
trash
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/resources.ap_
changes in dateUtils
trash
trash