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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp

src/server/game/AI/SmartScripts/SmartScriptMgr.h

@@ -1313,12 +1313,6 @@ enum SmartCastFlags
     SMARTCAST_COMBAT_MOVE            = 0x40                      //Prevents combat movement if cast successful. Allows movement on range, OOM, LOS
 };
 
-enum BroadcastTextIds
-{
-    BROADCAST_TEXT_CALL_FOR_HELP    = 2541,
-    BROADCAST_TEXT_FLEE_FOR_ASSIST  = 1150
-};
-
 // one line in DB is one event
 struct SmartScriptHolder
 {