Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h

src/server/scripts/Spells/spell_shaman.cpp

@@ -291,7 +291,7 @@ class spell_sha_earth_shield : public SpellScriptLoader
                     amount = GetUnitOwner()->SpellHealingBonusTaken(caster, GetSpellInfo(), amount, HEAL);
 
                     //! WORKAROUND
-                    // If target is affected by healing reduction, modifier is guaranteed to be negative 
+                    // If target is affected by healing reduction, modifier is guaranteed to be negative
                     // value (e.g. -50). To revert the effect, multiply amount with reciprocal of relative value:
                     // (100 / ((-1) * modifier)) * 100 = (-1) * 100 * 100 / modifier = -10000 / modifier
                     if (int32 modifier = GetUnitOwner()->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT))