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

Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index a4c11209e52..f508266434b 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -339,14 +339,14 @@ public:
                     waveTimer -= uiDiff;
             }
         }
-        
+
     private:
         uint8 wave;
         uint32 waveTimer;
         uint64 valrothGUID;
 
     };
-    
+
     CreatureAI* GetAI(Creature* creature) const
     {
         return new npc_koltira_deathweaverAI(creature);