Merge remote-tracking branch 'origin/master' into Importer

# Conflicts:
#	assets

resources/Schema/Components/Collidable.xsd

@@ -4,5 +4,8 @@
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 
 	<xs:element name="Collidable">
+		<xs:annotation>
+			<xs:documentation>Needs a Model or AABB component to work, uses AABB if both are attached.</xs:documentation>
+		</xs:annotation>
 	</xs:element>
 </xs:schema>

resources/Schema/Components/Trigger.xsd

@@ -4,5 +4,8 @@
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 
 	<xs:element name="Trigger">
+		<xs:annotation>
+			<xs:documentation>Needs a Model or AABB component to work, uses AABB if both are attached.</xs:documentation>
+		</xs:annotation>
 	</xs:element>
 </xs:schema>

resources/Schema/Entities/SplatMapTesWorld.xml

@@ -9,8 +9,14 @@
     <Entity>
       <Components>
         <c:SceneLight/>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
         <c:Model>
-          <Resource>Models/Test/SplatMapTest.mesh</Resource>
+          <Resource>Models/Ground.mesh</Resource>
         </c:Model>
         <c:Transform/>
       </Components>