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

# Conflicts:
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Network/Server.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Tests/OctTreeTestGameClass.cpp
#	src/Tests/OctTreeTestHardCodedTestWorld.h
#	src/Tests/ResourceManagerTest.cpp

src/Tests/OldOctTree.cpp

@@ -100,7 +100,7 @@ void OctTree::Update(float dt, World* world, Camera* cam)
 {
     AABB aabb;
     for (ComponentWrapper& c : *world->GetComponents("Collision")) {
-        aabb.CreateFromCenter(c["BoxCenter"], c["BoxSize"]);
+        aabb.FromOriginSize(c["BoxCenter"], c["BoxSize"]);
         AddStaticObject(aabb);
     }
     const glm::vec4 redCol = glm::vec4(1, 0.2f, 0, 1);
@@ -118,7 +118,7 @@ void OctTree::Update(float dt, World* world, Camera* cam)
 
     AABB box;
     auto boxPos = cam->Position() + 1.2f*cam->Forward();
-    box.CreateFromCenter(boxPos, boxSize);
+    box.FromOriginSize(boxPos, boxSize);
     ComponentWrapper transform = world->GetComponent(m_BoxID, "Transform");
     transform["Position"] = boxPos;
     ComponentWrapper model = world->GetComponent(m_BoxID, "Model");