Merge master into documentmanagement

.aditoprj/project.version

.idea/inspectionProfiles/Project_Default.xml

.idea/vcs.xml

...9.2/AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml

...ta_alias/basic/2019.2/AditoBasic/create_ab_loghistory.xml

...e/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml

...Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml

...alias/basic/2019.2/CampaignManagement/create_campaign.xml

...s/basic/2019.2/CampaignManagement/create_campaignCost.xml

...2019.2/CampaignManagement/create_campaignCostCategory.xml

.../2019.2/CampaignManagement/create_campaignParticipant.xml

...19.2/CampaignManagement/create_campaignParticipantLog.xml

.../basic/2019.2/CampaignManagement/create_campaignState.xml

...s/basic/2019.2/CampaignManagement/create_campaignStep.xml

...ic/2019.2/CampaignManagement/create_campaignStepState.xml

.liquibase/Data_alias/basic/2019.2/alter_activityLink.xml

...2019.2/change_Milestone_datatype_to_new_Keyword_logic.xml

.liquibase/Data_alias/basic/2019.2/changelog.xml

...a_alias/basic/2019.2/data/example_attribute/Attribute.xml

...as/basic/2019.2/data/example_attribute/AttributeUsage.xml