Merge origin/master

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<language xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/language/1.1.3">
+  <name>_____LANGUAGE_de</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <language>de</language>
+  <country></country>
+  <variant></variant>
+  <keyValueMap>
+    <entry>
+      <key>?</key>
+      <value>?</value>
+    </entry>
+  </keyValueMap>
+</language>

neonFrame/TASK_DATE_Neon/TASK_DATE_Neon.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonFrame xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonFrame/1.0.2">
+  <name>TASK_DATE_Neon</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <tableView>
+    <name>tableView</name>
+  </tableView>
+  <layout>
+    <name>layout</name>
+    <columnCount v="1" />
+    <rowCount v="1" />
+    <columnRatio>
+      <layoutRatio>
+        <name>2e8ee6c5-cb60-4870-949e-03c6fe4be1c0</name>
+        <index v="0" />
+        <ratio v="0.0" />
+        <size v="200" />
+      </layoutRatio>
+    </columnRatio>
+    <rowRatio>
+      <layoutRatio>
+        <name>e1b9cc56-1aeb-4daa-ba31-b1f8b9adcc17</name>
+        <index v="0" />
+        <ratio v="0.0" />
+        <size v="200" />
+      </layoutRatio>
+    </rowRatio>
+  </layout>
+</neonFrame>

preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

@@ -2,5 +2,5 @@
 <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1">
   <name>_____PREFERENCES_PROJECT</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <projectName>basic</projectName>
+  <projectName>xRM-Basic 5</projectName>
 </preferences>

system/default/default.aod

@@ -3,5 +3,7 @@
   <name>default</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <serverConfigPath>$ADITODATA/config/serverconfig_default.xml</serverConfigPath>
+  <aditoHomePath>$ADITOHOME</aditoHomePath>
   <aditoDataPath>$PROJECTHOME/data</aditoDataPath>
+  <loginUser>Admin</loginUser>
 </system>