merged master into DSGVO

.aditoprj/project.version

...basic/2019.2/AditoBasic/extendKeywordOrganisationType.xml

...c/2019.2/AditoBasic/removeAttributeKeywordTargetGroup.xml

...19.2/CampaignManagement/create_campaignParticipantLog.xml

...ic/2019.2/Classification/create_classification_tables.xml

...9.2/Classification/delete_salesprocejctClassification.xml

...ic/2019.2/Classification/insert_classification_scores.xml

...sic/2019.2/Classification/insert_classification_types.xml

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

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

aliasDefinition/Data_alias/Data_alias.aod

..._SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod

entity/360Degree_entity/360Degree_entity.aod

...newmodule/children/newcampaignparticipant/stateProcess.js

...tityfields/newmodule/children/newcontract/stateProcess.js

.../entityfields/newmodule/children/newoffer/stateProcess.js

...fields/newmodule/children/newsalesproject/stateProcess.js

...360Degree_entity/recordcontainers/jdito/contentProcess.js

entity/ActivityLink_entity/ActivityLink_entity.aod

entity/Activity_entity/Activity_entity.aod