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

# Conflicts:
#	include/Game/PlayerSystem.h
#	src/Game/Game.cpp
#	src/Game/PlayerSystem.cpp

resources/Schema/Entities/Test.xml

@@ -25,10 +25,13 @@
 			<Components>
 				<c:Transform>
 					<Position X="1.5"/>
+					<Scale X="2" Y="2" Z="2"/>
 				</c:Transform>
 				<c:Model>
 					<Resource>Models/RotationWidget.obj</Resource>
 				</c:Model>
+				<c:Trigger>
+				</c:Trigger>
 			</Components>
 		</Entity>
 		<!--<Entity>
@@ -42,6 +45,8 @@
 				<c:Model>
 					<Resource>Models/Core/UnitCube.obj</Resource>
 				</c:Model>
+				<c:AABB>
+				</c:AABB>
 			</Components>
 		</Entity>-->
 		<Entity>