Merge remote-tracking branch 'origin/master' into Kill-streak-sounds

# Conflicts:
#	resources/DefaultConfig.ini

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp_

@@ -366,9 +366,10 @@ bool AssaultWeaponBehaviour::shoot(double damage)
         return false;
     }
 
-    // Check for friendly fire
+
+    // If friendly fire - reduce damage to 0 (needed to make Boosts, Ammosharing work)
     if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)m_Player["Team"]["Team"]) {
-        return false;
+        damage = 0;
     }
 
     // Deal damage! 

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -88,7 +88,7 @@ void DefenderWeaponBehaviour::fireShell(WeaponInfo& wi)
         EntityWrapper spawner = weaponModelEntity.FirstChildByName("WeaponMuzzle");
         Events::PlaySoundOnEntity e;
         e.EmitterID = weaponModelEntity.ID;
-        e.FilePath = "Audio/laser/laser1.wav";
+        e.FilePath = "Audio/weapon/Shotgun/ShotgunFire.wav";
         m_EventBroker->Publish(e);
         for (auto& angles : pelletAngles) {
             glm::vec3 direction = Transform::AbsoluteOrientation(spawner) * glm::quat(glm::vec3(angles, 0.f)) * glm::vec3(0, 0, -1);