merge with master

entity/Appointment_entity/Appointment_entity.aod

@@ -123,7 +123,7 @@
       <name>LINKOBJECT</name>
       <title>Linkobject</title>
       <consumer>Objects</consumer>
-      <linkedContext>Object_context</linkedContext>
+      <linkedContext>Object</linkedContext>
     </entityField>
     <entityField>
       <name>ICON</name>
@@ -191,7 +191,7 @@
       <name>LINKTYPE</name>
       <title>Linktype</title>
       <consumer>Contexts</consumer>
-      <linkedContext>Context_context</linkedContext>
+      <linkedContext>Context</linkedContext>
     </entityField>
   </entityFields>
   <recordContainers>

entity/Attribute_entity/Attribute_entity.aod

@@ -30,7 +30,7 @@
       <name>ATTRIBUTE_PARENT_ID</name>
       <title>Parent Attribute</title>
       <consumer>AttributeChildren</consumer>
-      <linkedContext>Attribute_context</linkedContext>
+      <linkedContext>Attribute</linkedContext>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>

entity/Offeritem_entity/Offeritem_entity.aod

@@ -63,7 +63,7 @@
       <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
       <title>Article</title>
       <consumer>Products</consumer>
-      <linkedContext>Product_context</linkedContext>
+      <linkedContext>Product</linkedContext>
       <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>

entity/Orderitem_entity/Orderitem_entity.aod

@@ -63,7 +63,7 @@
       <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
       <title>Article</title>
       <consumer>Products</consumer>
-      <linkedContext>Product_context</linkedContext>
+      <linkedContext>Product</linkedContext>
       <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>