Merge branch 'master' into Respawning

# Conflicts:
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerSpawnSystem.cpp
#	src/Game/Systems/SoundSystem.cpp

include/Game/Systems/PlayerSpawnSystem.h

@@ -10,7 +10,7 @@
 class PlayerSpawnSystem : public ImpureSystem
 {
 public:
-    PlayerSpawnSystem(World* world, EventBroker* eventBroker);
+    PlayerSpawnSystem(SystemParams params);
 
     virtual void Update(double dt) override;