merged master into DSGVO

.aditoprj/project.version

..._alias/basic/2019.1.4/AditoBasic/create_ab_loghistory.xml

...019.1.4/AditoBasic/init_AttributeKeyword_target_group.xml

...ta_alias/basic/2019.1.4/AditoBasic/init_AttributeType.xml

.liquibase/Data_alias/basic/2019.1.4/AttributeKeyword.xml

.../Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml

...lias/basic/2019.1.4/BulkMail/create_bulkMailRecipient.xml

...se/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml

...Ticketmanagement/insertTicketAttributes_TaskType_Task.xml

.liquibase/Data_alias/basic/2019.1.4/changelog.xml

...alias/basic/2019.1.4/data/example_attribute/Attribute.xml

...se/Data_alias/basic/2019.1.4/indicesRefactor/Activity.xml

...ic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTE.xml

...e/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml

aliasDefinition/Data_alias/Data_alias.aod

..._SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod

entity/360Degree_entity/360Degree_entity.aod

entity/ActivityLink_entity/ActivityLink_entity.aod

entity/Activity_entity/Activity_entity.aod

entity/AddressType_entity/AddressType_entity.aod