merge with Vladimir
merging
changes in AdditionWork and text formating
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.class
	TourPilot/src/isebase/cognito/tourpilot/Data/AdditionalWork/AdditionalWork.java
	TourPilot/src/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.java
small changes in db classes
11
11
remove unused imports
remove unused imports
Merge branch 'BogdansBranch' of
ssh://git@github.com/andrewgtv/TourPilot.git into BogdansBranch
changes in connection
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Worker/WorkerManager.class
changes is connection
change db date
Merge branch 'BogdansBranch'
change db date
Changes in AdditionalTasks and Catalogs activities
Merge branch 'VladimirsBranch'
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git
commit class.
Refactor changes