trash
trash
catalogs
changes in additional tasks
trash
trash
trash
Merge branch 'BogdansBranch' of ssh://git@github.com/andrewgtv/TourPilot.git into BogdansBranch
trash
trash
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$id.class
	TourPilot/gen/isebase/cognito/tourpilot/R.java