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

# Conflicts:
#	include/Engine/Collision/CollidableOctreeSystem.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Systems/PlayerSystem.h
#	resources/Schema/Components/Physics.xsd
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
#	src/Game/Systems/HealthSystem.cpp
#	src/Game/Systems/PlayerSystem.cpp
#	src/Tests/OctTreeTestGameClass.cpp

src/Engine/Core/ComponentPool.cpp

@@ -71,6 +71,11 @@ ComponentPool::iterator ComponentPool::end() const
     return iterator(m_ComponentInfo, m_Pool.end(), m_Pool.end());
 }
 
+size_t ComponentPool::size() const
+{
+    return m_Pool.size();
+}
+
 template <typename InterpretType /*= char*/>
 void ComponentPool::Dump() const
 {