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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp

src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp

@@ -577,9 +577,6 @@ class boss_twilight_halion : public CreatureScript
                         break;
                 }
             }
-
-        private:
-            EventMap events;
         };
 
         CreatureAI* GetAI(Creature* creature) const override