merge with Vladimir
Changes in AdditionalTasks and Catalogs activities
Merge branch 'VladimirsBranch'
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git