Included changes from WI branch

SDT/schema4.0/docs/SDT_UML.uxf

@@ -62,9 +62,9 @@ fontsize=10</panel_attributes>
     <id>UMLClass</id>
     <coordinates>
       <x>1460</x>
-      <y>1080</y>
+      <y>1090</y>
       <w>150</w>
-      <h>220</h>
+      <h>240</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 BasicType
@@ -79,7 +79,8 @@ date
 time
 datetime
 blob
-uri</panel_attributes>
+uri
+void</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
@@ -213,14 +214,14 @@ m1=0..*
     <id>Relation</id>
     <coordinates>
       <x>1140</x>
-      <y>1290</y>
+      <y>1320</y>
       <w>420</w>
-      <h>130</h>
+      <h>100</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=1
 </panel_attributes>
-    <additional_attributes>390.0;10.0;390.0;110.0;10.0;110.0</additional_attributes>
+    <additional_attributes>390.0;10.0;390.0;80.0;10.0;80.0</additional_attributes>
   </element>
   <element>
     <id>UMLClass</id>
@@ -822,13 +823,13 @@ m1= 1..*
     <id>Relation</id>
     <coordinates>
       <x>1410</x>
-      <y>1290</y>
+      <y>1320</y>
       <w>110</w>
-      <h>90</h>
+      <h>60</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=0,1
 </panel_attributes>
-    <additional_attributes>70.0;10.0;70.0;70.0;10.0;70.0</additional_attributes>
+    <additional_attributes>70.0;10.0;70.0;40.0;10.0;40.0</additional_attributes>
   </element>
 </diagram>