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

# Conflicts:
#	include/Game/Game.h
#	src/Engine/Core/OctTree.cpp
#	src/Game/Game.cpp
#	src/Tests/CMakeLists.txt
#	src/Tests/OctTreeTest.cpp
#	src/Tests/WorldTest.cpp

include/Tests/OctTreeTestGameClass.h

@@ -11,7 +11,8 @@
 #include "Rendering/RenderQueueFactory.h"
 
 #include "OctTreeTestHardCodedTestWorld.h"
-#include "Core\Collision.h"
+#include "Collision/Collision.h"
+
 
 class Game
 {