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

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Components/SoundEmitter.h

@@ -10,13 +10,14 @@ namespace Components
 	
 struct SoundEmitter : Component
 {
+
 	enum class SoundType
 	{
 		SOUND_3D,
 		SOUND_2D
 	};
 
-	SoundEmitter() : Gain(1.f), MaxDistance(1.f), MinDistance(1.f), Pitch(1.f), Loop(false) {}
+	SoundEmitter() : Gain(1.f), MaxDistance(10000.f), MinDistance(1.f), Pitch(1.f), Loop(false) {}
 	float Gain;
 	float MaxDistance;
 	float MinDistance;

src/Components/SpawnPoint.h

@@ -8,6 +8,8 @@ namespace Components
 
 struct SpawnPoint : Component
 {
+	EntityID Player;
+
 	virtual SpawnPoint* Clone() const override { return new SpawnPoint(*this); }
 };