merged master into DSGVO

.aditoprj/project.version

...ase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml

...ata_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml

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

.liquibase/Data_alias/basic/_demoData/changelog.xml

...as/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml

...alias/basic/_demoData/generatedData/AB_OBJECTRELATION.xml

...s/basic/_demoData/generatedData/AB_OBJECTRELATIONTYPE.xml

...ase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml

...Data_alias/basic/_demoData/generatedData/ACTIVITYLINK.xml

...base/Data_alias/basic/_demoData/generatedData/ADDRESS.xml

...ata_alias/basic/_demoData/generatedData/COMMUNICATION.xml

...base/Data_alias/basic/_demoData/generatedData/CONTACT.xml

...ase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml

..._alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml

...ase/Data_alias/basic/_demoData/generatedData/FORECAST.xml

...ibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml

...uibase/Data_alias/basic/_demoData/generatedData/OFFER.xml

...se/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml

...Data_alias/basic/_demoData/generatedData/ORGANISATION.xml