merged master into DSGVO

...1.4/AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml

...oBasic/ab_keyword_attributerelation_add_longtext_type.xml

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

...sic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml

...alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml

...Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml

...019.1.4/AditoBasic/init_AttributeKeyword_target_group.xml

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

...as/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml

.../2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml

...ias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml

...lias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml

..._alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml

...ata_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml

...alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml

...Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml

...2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml

...lias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml

...lias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml

...ata_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml