diff --git a/.liquibase/Data_alias/basic/2019.2/addDefaultAddresses.xml b/.liquibase/Data_alias/basic/2019.2/addDefaultAddresses.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89f728070981d2c6fdd75db4ca6834b79adc34ec
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/addDefaultAddresses.xml
@@ -0,0 +1,274 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="58c94c79-1c82-43b3-bd19-324955d4cbfb">
+ <!--Lisa Sommer-->
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="11d01332-985b-4efe-a634-da71ae482907"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
+ </whereParams>
+ </update>
+
+ <!--MNF-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Bayern"/>
+ <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="CITY" value="München"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="ADDRIDENTIFIER" value="Tor 1"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
+ <column name="BUILDINGNO" value="3"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="80807"/>
+ <column name="ADDRESS" value="Muster-Straße"/>
+ <column name="DISTRICT" value="Oberbayern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="e6da1393-f46b-41a4-826b-2c7d22de2246" />
+ </whereParams>
+ </update>
+
+ <!--Lichtenstein-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Bayern"/>
+ <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="CITY" value="München"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="ADDRIDENTIFIER" value="Tor 1"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
+ <column name="BUILDINGNO" value="35"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="80807"/>
+ <column name="ADDRESS" value="Lützowplatz"/>
+ <column name="DISTRICT" value="Oberbayern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="e83c45e0-c30b-436e-b445-00a8b58383b0" />
+ </whereParams>
+ </update>
+
+ <!--International Kältetechnik AG-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Bayern"/>
+ <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="CITY" value="München"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="ADDRIDENTIFIER" value="Tor 1"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="92a244c5-6065-458c-abc7-57d0dc955011"/>
+ <column name="BUILDINGNO" value="48"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="63847"/>
+ <column name="ADDRESS" value="Hildburghausen"/>
+ <column name="DISTRICT" value="Oberbayern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="92a244c5-6065-458c-abc7-57d0dc955011"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="e83c45e0-c30b-436e-b445-00a8b58383b0" />
+ </whereParams>
+ </update>
+
+ <!--Pichelmaier Financial AG-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Bayern"/>
+ <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="CITY" value="München"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="ADDRIDENTIFIER" value="Tor 1"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
+ <column name="BUILDINGNO" value="6"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="54595"/>
+ <column name="ADDRESS" value="Rudower Strasse"/>
+ <column name="DISTRICT" value="Oberbayern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="fd082db5-be43-4219-a705-588f9c06e59b" />
+ </whereParams>
+ </update>
+
+ <!--Peter Pfiffig-->
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="14d01332-985b-4efe-a634-da71ae482907"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d" />
+ </whereParams>
+ </update>
+
+ <!--Franz Müller-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Bayern"/>
+ <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="CITY" value="Bergkirchen"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+ <column name="ADDRIDENTIFIER"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
+ <column name="BUILDINGNO" value="32"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="85230"/>
+ <column name="ADDRESS" value="Büsingstrasse"/>
+ <column name="DISTRICT" value="Oberbayern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="f0fb7676-8183-4bc7-beca-ca32c1e11c10" />
+ </whereParams>
+ </update>
+
+ <!--Birgit Leicht-->
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
+ </whereParams>
+ </update>
+
+ <!--Ludwig Kanzler-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Bayern"/>
+ <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="CITY" value="München"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="ADDRIDENTIFIER"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
+ <column name="BUILDINGNO" value="83"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="80456"/>
+ <column name="ADDRESS" value="Landsberger Allee"/>
+ <column name="DISTRICT" value="Oberbayern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1" />
+ </whereParams>
+ </update>
+
+ <!--Jerome Grüner-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Bayern"/>
+ <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="CITY" value="Niederkirchen"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="ADDRIDENTIFIER"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
+ <column name="BUILDINGNO" value="48"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="67700"/>
+ <column name="ADDRESS" value="Grosse Praesidenten Str."/>
+ <column name="DISTRICT" value="Oberbayern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1" />
+ </whereParams>
+ </update>
+
+ <!--Herbert Obermeier-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Bayern"/>
+ <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="CITY" value="Bielefeld Babenhausen"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+ <column name="ADDRIDENTIFIER"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
+ <column name="BUILDINGNO" value="67"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="33739"/>
+ <column name="ADDRESS" value="Spresstrasse"/>
+ <column name="DISTRICT" value="Oberbayern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
+ </whereParams>
+ </update>
+
+ <!--Harold Smith-->
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Mecklenburg-Vorpommern"/>
+ <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="CITY" value="Rostock"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+ <column name="ADDRIDENTIFIER"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
+ <column name="BUILDINGNO" value="95"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="18074"/>
+ <column name="ADDRESS" value="Kurfürstendamm"/>
+ <column name="DISTRICT" value="Mecklenburg-Vorpommern"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
+ </whereParams>
+ </update>
+
+ <!--Susanne Lustig-->
+ <update tableName="CONTACT">
+ <column name="ADDRESS_ID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
+ <where>CONTACTID = ? and ADDRESS_ID is null</where>
+ <whereParams>
+ <param value="1ca67eaa7-21da-4a18-97ab-755ac5cb74f7" />
+ </whereParams>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 2892c7b25296464c0491174e734f1a2927bb5f7a..9a955cdae7d56bd055fa215b1cdb0a9b3ffd5a12 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -143,7 +143,6 @@
<include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic_Derby.xml" />
<include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
- <include relativeToChangelogFile="true" file="create_documenttemplate.xml"/>
<include relativeToChangelogFile="true" file="create_documenttemplatelink.xml"/>
<include relativeToChangelogFile="true" file="data/init_DocumentTemplateType.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_admin.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_admin.xml
index 0bd25176811a68603ed941db223b84ea0592c6d7..0c15468561e1105847a568f7e64803487f37cbeb 100644
--- a/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_admin.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_admin.xml
@@ -18,6 +18,24 @@
<column name="CONTACTID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="ADDRESS_ID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
+ <column name="USER_NEW" value="Admin"/>
+ <column name="DATE_NEW" valueComputed="current_datetime"/>
+ </insert>
+ <insert tableName="ADDRESS">
+ <column name="STATE" value="Freistaat Bayern"/>
+ <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="CITY" value="Heinrichsthal"/>
+ <column name="COUNTRY" value="DE"/>
+ <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+ <column name="ADDRIDENTIFIER"/>
+ <column name="REGION" value=""/>
+ <column name="ADDRESSID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
+ <column name="BUILDINGNO" value="77"/>
+ <column name="ADDRESSADDITION"/>
+ <column name="ZIP" value="18074"/>
+ <column name="ADDRESS" value="Rudolstaedter Strasse"/>
+ <column name="DISTRICT" value="Bayern"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueComputed="current_datetime"/>
</insert>