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

NOTE (in config file):
[Debug]
LoadMap=Schema/Entities/Test.xml

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

include/Engine/Rendering/RenderQueue.h

@@ -7,7 +7,7 @@
 #include "../Common.h"
 #include "../GLM.h"
 #include "../Core/Util/Rectangle.h"
-#include "../Core/EntityWrapper.h"
+#include "../Core/Entity.h"
 
 class Model;
 class Skeleton;

include/Engine/Rendering/RenderQueueFactory.h

@@ -22,7 +22,10 @@ private:
     void FillLights(World* world, RenderQueue* renderQueue);
 
     glm::mat4 ModelMatrix(World* world, EntityID entity);
-    glm::vec3 GetAbsolutePosition(World* world, ComponentWrapper transformComponent);
+
+    glm::vec3 AbsolutePosition(World* world, EntityID entity);
+    glm::quat AbsoluteOrientation(World* world, EntityID entity);
+    glm::vec3 AbsoluteScale(World* world, EntityID entity);
 };
 
 #endif