Merge branch 'RDM-2020-0024-SDT_4_0_-_Renaming_Data_Types' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
#	SDT/schema4.0/docs/images/SDT_simplified.png
#	SDT/schema4.0/test/subdevices-test.xml

SDT/schema4.0/test/productClass-test.xml

@@ -5,7 +5,7 @@
 			<Doc>This is a test product</Doc>
 			<Properties>
 				<Property name="aProperty">
-					<SimpleType type="string"></SimpleType>
+					<Simple type="string" />
 				</Property>
 			</Properties>
 			<ModuleClasses>

SDT/schema4.0/test/semanticURI-test.xml

@@ -4,7 +4,7 @@
 <Domain id="semanticURI-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" semanticURI="http://example.com/semanticURI-test.rdf">
 	<DataTypes>
 		<DataType name="temperatureType" unitOfMeasure="C" semanticURI="http://example.com/temperatureType.rdf">
-			<SimpleType type="float"/>
+			<Simple type="float"/>
 		</DataType>
 		<DataType name="anEnumType" semanticURI="http://example.com/anEnumType.rdf">
 			<Enum>

SDT/schema4.0/test/subdevices-test.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Test the data types references -->
+<!-- Test the sub-device references -->
 
 <Domain id="subdevices-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<SubDevices>
@@ -9,7 +9,7 @@
 					<Data>
 						<DataPoint name="aDataPoint">
 							<DataType>
-								<SimpleType type="boolean" />
+								<Simple type="boolean" />
 							</DataType>
 						</DataPoint>
 					</Data>

SDT/schema4.0/test/void-test.xml

@@ -7,14 +7,14 @@
 			<Actions>
 				<Action name="TestVoidAction">
 					<DataType>
-						<SimpleType type="void"/>
+						<Simple type="void"/>
 					</DataType>
 				</Action>
 			</Actions>
 			<Data>
 				<DataPoint name="TestVoidDataPoint" writable="true">
 					<DataType>
-						<SimpleType type="void"/>
+						<Simple type="void"/>
 					</DataType>
 				</DataPoint>
 			</Data>