Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceScript.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellInfo.h

2 files changed, 3 insertions, 3 deletions

diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h
index 19ebfb3adfc..5011ec1c1be 100755
--- a/src/server/shared/Dynamic/TypeContainerFunctions.h
+++ b/src/server/shared/Dynamic/TypeContainerFunctions.h
@@ -36,7 +36,7 @@ namespace Trinity
     template<class SPECIFIC_TYPE> size_t Count(const ContainerMapList<SPECIFIC_TYPE> &elements, SPECIFIC_TYPE* /*fake*/)
     {
         return elements._element.getSize();
-    };
+    }
 
     template<class SPECIFIC_TYPE> size_t Count(const ContainerMapList<TypeNull> &/*elements*/, SPECIFIC_TYPE* /*fake*/)
     {
@@ -64,7 +64,7 @@ namespace Trinity
         //elements._element[hdl] = obj;
         obj->AddToGrid(elements._element);
         return obj;
-    };
+    }
 
     template<class SPECIFIC_TYPE> SPECIFIC_TYPE* Insert(ContainerMapList<TypeNull> &/*elements*/, SPECIFIC_TYPE * /*obj*/)
     {
diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h
index beddb31f343..155989f15f6 100755
--- a/src/server/shared/Dynamic/TypeContainerVisitor.h
+++ b/src/server/shared/Dynamic/TypeContainerVisitor.h
@@ -35,7 +35,7 @@ template<class T, class Y> class TypeContainerVisitor;
 template<class VISITOR, class TYPE_CONTAINER> void VisitorHelper(VISITOR &v, TYPE_CONTAINER &c)
 {
     v.Visit(c);
-};
+}
 
 // terminate condition for container list
 template<class VISITOR> void VisitorHelper(VISITOR &v, ContainerList<TypeNull> &c)