diff --git a/.liquibase/Data_alias/basic/2019.3.2/changelog.xml b/.liquibase/Data_alias/basic/2019.3.2/changelog.xml
index a4e00d6824c9fbe532099617b191660e34e23908..fefedba588d38d56560b98e1521cc218fa884df7 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/changelog.xml
@@ -3,4 +3,5 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     
     <include relativeToChangelogFile="true" file="insert_TicketType_attributes_usages.xml"/>
+    <include relativeToChangelogFile="true" file="rename_supportticket.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.3.2/rename_supportticket.xml b/.liquibase/Data_alias/basic/2019.3.2/rename_supportticket.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c223e41bba3334fc85e509cbfc32f16a2d8b652c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.3.2/rename_supportticket.xml
@@ -0,0 +1,9 @@
+<?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="e5c47286-7fde-4003-96d9-bb6376ae08ca">                  
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="Support ticket"/>
+            <where>AB_KEYWORD_ENTRYID='98075159-ecc2-4851-a971-6f3123a495d3'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index aed2d2691244c6fa59e0c2a4b2e64040f5705ade..7f1363fd58acb4005c45be8e713328b8617b31b1 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -140,8 +140,8 @@
           <tooltip>Choose a campaign and a step to add the contact to a  campaign</tooltip>
         </entityActionField>
         <entityActionField>
-          <name>newSupportticket</name>
-          <title>New Supportticket</title>
+          <name>newSupport ticket</name>
+          <title>New Support ticket</title>
           <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsupportticket/onActionProcess.js</onActionProcess>
           <iconId>VAADIN:CHAT</iconId>
         </entityActionField>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index a738396f94cc0e9a6a44d5b472b3cac03663e267..66605b1269f04f9255435aede38861c843c85838 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -474,8 +474,8 @@
       </children>
     </entityConsumer>
     <entityActionField>
-      <name>newSupportticket</name>
-      <title>New Supportticket</title>
+      <name>newSupport ticket</name>
+      <title>New Support ticket</title>
       <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:chat</iconId>
     </entityActionField>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index c9ac20ac71a1cf9951c190ddac114436eca266f0..a15c230617f4818da45f1c73e05f32b1f5892bad 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -370,8 +370,8 @@
       <expose v="true" />
     </entityParameter>
     <entityActionField>
-      <name>newSupportticket</name>
-      <title>New Supportticket</title>
+      <name>newSupport ticket</name>
+      <title>New Support ticket</title>
       <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:chat</iconId>
     </entityActionField>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index e51096910ffe3c6f46df4177970ea169b2f4f4e7..133821df88ca526038ce27dfa5af4f9b101909f2 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -418,8 +418,8 @@
       <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
     </entityField>
     <entityActionField>
-      <name>newSupportticket</name>
-      <title>New Supportticket</title>
+      <name>newSupport ticket</name>
+      <title>New Support ticket</title>
       <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:chat</iconId>
     </entityActionField>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index baba4481f351593f815316f158804611ff8873fc..7948e6b6c16bd607afd02157840efc3cd7880a43 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -3547,7 +3547,7 @@
       <key>${SQL_LIB_FIELD_WRONG_FORMAT} field: %0</key>
     </entry>
     <entry>
-      <key>New Supportticket</key>
+      <key>New Support ticket</key>
     </entry>
     <entry>
       <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
@@ -4267,7 +4267,7 @@
       <key>{$TICKET_EDITOR}</key>
     </entry>
     <entry>
-      <key>Supportticket</key>
+      <key>Support ticket</key>
     </entry>
     <entry>
       <key>Modul group</key>
@@ -5226,6 +5226,12 @@
     <entry>
       <key>My contacts</key>
     </entry>
+    <entry>
+      <key>subsidiary of</key>
+    </entry>
+    <entry>
+      <key>parent company of</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod.orig b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod.orig
index df1f12e6769d0f569e408f15a4b609a9055c5792..43e9e5efe9c3ea18adca80ad06195c581c779930 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod.orig
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod.orig
@@ -1123,7 +1123,7 @@
       <key>Jordan</key>
     </entry>
     <entry>
-      <key>Côte d'Ivoire</key>
+      <key>Côte d'Ivoire</key>
     </entry>
     <entry>
       <key>United Arab Emirates</key>
@@ -1492,7 +1492,7 @@
       <key>Kazakhstan</key>
     </entry>
     <entry>
-      <key>Ã…land Islands</key>
+      <key>Åland Islands</key>
     </entry>
     <entry>
       <key>Bahamas</key>
@@ -1771,7 +1771,7 @@
       <key>Ukraine</key>
     </entry>
     <entry>
-      <key>Curaçao</key>
+      <key>Curaçao</key>
     </entry>
     <entry>
       <key>Anguilla</key>
@@ -1870,7 +1870,7 @@
       <key>ended</key>
     </entry>
     <entry>
-      <key>Saint Barthélemy</key>
+      <key>Saint Barthélemy</key>
     </entry>
     <entry>
       <key>Wallis and Futuna</key>
@@ -1888,7 +1888,7 @@
       <key>Hungary</key>
     </entry>
     <entry>
-      <key>Réunion</key>
+      <key>Réunion</key>
     </entry>
     <entry>
       <key>Japan</key>
@@ -2278,7 +2278,7 @@
       <key>Other Contactroles</key>
     </entry>
     <entry>
-      <key>Bitte Datumseingabe prüfen!</key>
+      <key>Bitte Datumseingabe prüfen!</key>
     </entry>
     <entry>
       <key>In Bearbeitung</key>
@@ -2293,10 +2293,10 @@
       <key>Bitte Filterbedingungen setzen</key>
     </entry>
     <entry>
-      <key>Bestätigt</key>
+      <key>Bestätigt</key>
     </entry>
     <entry>
-      <key>Vorläufig</key>
+      <key>Vorläufig</key>
     </entry>
     <entry>
       <key>keine</key>
@@ -2311,13 +2311,13 @@
       <key>&amp;Aufgaben (%0)</key>
     </entry>
     <entry>
-      <key>erledigt / zurückgestellt</key>
+      <key>erledigt / zurückgestellt</key>
     </entry>
     <entry>
       <key>hoch</key>
     </entry>
     <entry>
-      <key>Zurückgestellt</key>
+      <key>Zurückgestellt</key>
     </entry>
     <entry>
       <key>Erledigt</key>
@@ -2326,13 +2326,13 @@
       <key>Abgesagt</key>
     </entry>
     <entry>
-      <key>Außer Haus</key>
+      <key>Außer Haus</key>
     </entry>
     <entry>
       <key>Abbrechen</key>
     </entry>
     <entry>
-      <key>Benutzer auswählen</key>
+      <key>Benutzer auswählen</key>
     </entry>
     <entry>
       <key>delegiert</key>
@@ -3571,10 +3571,10 @@
       <key>Price Condition</key>
     </entry>
     <entry>
-      <key>Entität</key>
+      <key>Entität</key>
     </entry>
     <entry>
-      <key>beschränken</key>
+      <key>beschränken</key>
     </entry>
     <entry>
       <key>Feld</key>
@@ -3634,7 +3634,7 @@
       <key>closed</key>
     </entry>
     <entry>
-      <key>New Supportticket</key>
+      <key>New Support ticket</key>
     </entry>
     <entry>
       <key>Bug Ticket</key>
@@ -3649,7 +3649,7 @@
       <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
     </entry>
     <entry>
-      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
     </entry>
     <entry>
       <key>Search for new Entries</key>
@@ -3811,7 +3811,7 @@
       <key>No risk</key>
     </entry>
     <entry>
-      <key>Urlaubsprüfung durch</key>
+      <key>Urlaubsprüfung durch</key>
     </entry>
     <entry>
       <key>Acquisition</key>
@@ -4003,7 +4003,7 @@
       <key>Transport damage</key>
     </entry>
     <entry>
-      <key>Konditionen die bei Angebotserstellung übernommen werden</key>
+      <key>Konditionen die bei Angebotserstellung übernommen werden</key>
     </entry>
     <entry>
       <key>Sport</key>
@@ -4426,7 +4426,7 @@
       <key>{$TICKET_EDITOR}</key>
     </entry>
     <entry>
-      <key>Supportticket</key>
+      <key>Support ticket</key>
     </entry>
     <entry>
       <key>Modul group</key>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 2be43831f3ed18cad0ca241bc3e98ec3b1e3fa8c..c88b1fa7bd5b6ea6c7db03cb934973414ed8c5ff 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -4918,7 +4918,7 @@
       <key>Email Template</key>
     </entry>
     <entry>
-      <key>New Supportticket</key>
+      <key>New Support ticket</key>
       <value>Neues Supportticket</value>
     </entry>
     <entry>
@@ -5243,6 +5243,7 @@
     </entry>
     <entry>
       <key>Support Tickets</key>
+      <value></value>
     </entry>
     <entry>
       <key>Handcraft</key>
@@ -5712,7 +5713,8 @@
       <value>Umsatz Vorjahr</value>
     </entry>
     <entry>
-      <key>Supportticket</key>
+      <key>Support ticket</key>
+      <value>Supportticket</value>
     </entry>
     <entry>
       <key>Modul group</key>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod.orig b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod.orig
index e5c0c315bda5609da7de56d6e381e04f6dd25049..50cb8cf7b5b03e605d82a43db073d5019421336f 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod.orig
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod.orig
@@ -4796,7 +4796,7 @@
       <key>closed</key>
     </entry>
     <entry>
-      <key>New Supportticket</key>
+      <key>New Support ticket</key>
       <value>Neues Supportticket</value>
     </entry>
     <entry>
@@ -5608,7 +5608,8 @@
       <value>Bearbeiter</value>
     </entry>
     <entry>
-      <key>Supportticket</key>
+      <key>Support ticket</key>
+      <value>Supportticket</key>
     </entry>
     <entry>
       <key>Modul group</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index a9c02058b4a6ea0bd45afa1b9e022562ac61300f..ec4820e519ab62c00f6c4d2e77c48a3666fdc004 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -3597,7 +3597,7 @@
       <value>Field %0 is in an incorrect format. The database field has to be like "tablename.columnname" ("ORGANISATION.NAME") or as array with column-alias: ["ORGANISATION", "NAME", "myorgAlias"]</value>
     </entry>
     <entry>
-      <key>New Supportticket</key>
+      <key>New Support ticket</key>
     </entry>
     <entry>
       <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
@@ -4317,7 +4317,7 @@
       <key>{$TICKET_EDITOR}</key>
     </entry>
     <entry>
-      <key>Supportticket</key>
+      <key>Support ticket</key>
     </entry>
     <entry>
       <key>Modul group</key>
@@ -5276,6 +5276,12 @@
     <entry>
       <key>My contacts</key>
     </entry>
+    <entry>
+      <key>subsidiary of</key>
+    </entry>
+    <entry>
+      <key>parent company of</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod.orig b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod.orig
index 61cb124c6dac25890d1a17f5a899240cb29859ad..8ec4fc23e9630b8275296e508bb81cf4b25d947f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod.orig
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod.orig
@@ -484,7 +484,7 @@
     </entry>
     <entry>
       <key>${EURO_SIGN}</key>
-      <value>€</value>
+      <value>€</value>
     </entry>
     <entry>
       <key>Planned</key>
@@ -2458,40 +2458,40 @@
       <key>New module</key>
     </entry>
     <entry>
-      <key>Côte d'Ivoire</key>
+      <key>Côte d'Ivoire</key>
     </entry>
     <entry>
-      <key>Bitte Datumseingabe prüfen!</key>
+      <key>Bitte Datumseingabe prüfen!</key>
     </entry>
     <entry>
-      <key>Bestätigt</key>
+      <key>Bestätigt</key>
     </entry>
     <entry>
-      <key>Vorläufig</key>
+      <key>Vorläufig</key>
     </entry>
     <entry>
-      <key>Saint Barthélemy</key>
+      <key>Saint Barthélemy</key>
     </entry>
     <entry>
-      <key>erledigt / zurückgestellt</key>
+      <key>erledigt / zurückgestellt</key>
     </entry>
     <entry>
-      <key>Zurückgestellt</key>
+      <key>Zurückgestellt</key>
     </entry>
     <entry>
-      <key>Außer Haus</key>
+      <key>Außer Haus</key>
     </entry>
     <entry>
-      <key>Benutzer auswählen</key>
+      <key>Benutzer auswählen</key>
     </entry>
     <entry>
-      <key>Ã…land Islands</key>
+      <key>Åland Islands</key>
     </entry>
     <entry>
-      <key>Curaçao</key>
+      <key>Curaçao</key>
     </entry>
     <entry>
-      <key>Réunion</key>
+      <key>Réunion</key>
     </entry>
     <entry>
       <key>date of birth must not be in the future</key>
@@ -3625,10 +3625,10 @@
       <key>Price Condition</key>
     </entry>
     <entry>
-      <key>Entität</key>
+      <key>Entität</key>
     </entry>
     <entry>
-      <key>beschränken</key>
+      <key>beschränken</key>
     </entry>
     <entry>
       <key>Feld</key>
@@ -3683,7 +3683,7 @@
       <key>closed</key>
     </entry>
     <entry>
-      <key>New Supportticket</key>
+      <key>New Support ticket</key>
     </entry>
     <entry>
       <key>Bug Ticket</key>
@@ -3698,7 +3698,7 @@
       <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
     </entry>
     <entry>
-      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
     </entry>
     <entry>
       <key>Search for new Entries</key>
@@ -3860,7 +3860,7 @@
       <key>No risk</key>
     </entry>
     <entry>
-      <key>Urlaubsprüfung durch</key>
+      <key>Urlaubsprüfung durch</key>
     </entry>
     <entry>
       <key>Acquisition</key>
@@ -4052,7 +4052,7 @@
       <key>Transport damage</key>
     </entry>
     <entry>
-      <key>Konditionen die bei Angebotserstellung übernommen werden</key>
+      <key>Konditionen die bei Angebotserstellung übernommen werden</key>
     </entry>
     <entry>
       <key>Sport</key>
@@ -4475,7 +4475,7 @@
       <key>{$TICKET_EDITOR}</key>
     </entry>
     <entry>
-      <key>Supportticket</key>
+      <key>Support ticket</key>
     </entry>
     <entry>
       <key>Modul group</key>