Bisness classes
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git
add catalog
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
Merge branch 'VladimirsBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/src/isebase/cognito/tourpilot/Data/BaseObject/BaseObject.java
	TourPilot/src/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Option/Option.java
merge with Vladimir