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
trash
trash
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Connection/ServerCommandParser.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/TaskManager.class
changes in additional task
trash
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.class
changes in PIN, add button TourEnde, add logout proof dialog
trash
Merge branch 'BogdansBranch'
trash
changes in week date format - MM.dd to dd.MM
Merge branch 'BogdansBranch'
trash
trash
Merge branch 'BogdansBranch'