Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam

# Conflicts:
#	include/Engine/Core/EPlayerHealthPickup.h

include/Game/Systems/InterpolationSystem.h

@@ -23,7 +23,7 @@ class InterpolationSystem : public PureSystem
         glm::vec3 Position;
         glm::vec3 Scale;
         glm::quat Orientation;
-        double interpolationTime;
+        float interpolationTime;
     };
 public:
     InterpolationSystem(World* world, EventBroker* eventBroker);

include/Game/Systems/PlayerMovementSystem.h

@@ -20,4 +20,5 @@ private:
 
     EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
+
 };