Merge origin/master

neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod

@@ -11,7 +11,7 @@
     <genericMultipleViewTemplate>
       <name>GenericMultiple_template</name>
       <entityField>#ENTITY</entityField>
-      <children>
+      <columns>
         <neonTableColumn>
           <name>b210372e-dfd3-4cec-bc2e-84b72aebb2b6</name>
           <entityField>ADDR_TYPE</entityField>
@@ -40,7 +40,7 @@
           <name>33bcfdad-8466-4191-b9e3-7e5d73e384a6</name>
           <entityField>IS_STANDARD</entityField>
         </neonTableColumn>
-      </children>
+      </columns>
     </genericMultipleViewTemplate>
   </children>
 </neonView>

neonView/CommMultiEdit_view/CommMultiEdit_view.aod

@@ -11,7 +11,7 @@
     <genericMultipleViewTemplate>
       <name>GenericMultiple_template</name>
       <entityField>#ENTITY</entityField>
-      <children>
+      <columns>
         <neonTableColumn>
           <name>b210222e-dfd3-4cec-bc2e-84b72aebb2b6</name>
           <entityField>MEDIUM_ID</entityField>
@@ -20,7 +20,7 @@
           <name>c20668f3-6722-4a38-86d6-0d29be06dbe1</name>
           <entityField>ADDR</entityField>
         </neonTableColumn>
-      </children>
+      </columns>
     </genericMultipleViewTemplate>
   </children>
 </neonView>