Merge remote-tracking branch 'origin/havok' into particles

Conflicts:
	src/Components/Vehicle.h

src/Components/SphereShape.h

@@ -0,0 +1,21 @@
+#ifndef Components_Sphere_h__
+#define Components_Sphere_h__
+
+#include "Component.h"
+
+namespace Components
+{
+
+struct SphereShape : Component
+{
+	SphereShape()
+		: Radius(1.f){ }
+
+	float Radius;
+
+	virtual SphereShape* Clone() const override { return new SphereShape(*this); }
+};
+
+}
+
+#endif // Components_Sphere_h__