Merge branch 'master' of https://github.com/EQEmu/Server into EQEmu-master

Conflicts:
	zone/client.h
	zone/mod_functions.cpp
	zone/mod_functions_base.cpp

zone/mob.h

@@ -970,11 +970,6 @@ protected:
 	Timer tic_timer;
 	Timer mana_timer;
 
-	float rewind_x;
-	float rewind_y;
-	float rewind_z;
-	Timer rewind_timer;
-
 	//spell casting vars
 	Timer spellend_timer;
 	uint16 casting_spell_id;
@@ -993,6 +988,11 @@ protected:
 	uint8 bardsong_slot;
 	uint32 bardsong_target_id;
 
+	float rewind_x;
+	float rewind_y;
+	float rewind_z;
+	Timer rewind_timer;
+
 	// Currently 3 max nimbus particle effects at a time
 	uint32 nimbus_effect1;
 	uint32 nimbus_effect2;
@@ -1027,6 +1027,10 @@ protected:
 	int16 rooted_mod; //Modifier to root break chance, defined when root is cast on a target.
 	bool offhand;
 
+	// Bind wound
+	Timer bindwound_timer;
+	Mob* bindwound_target;
+
 	Timer stunned_timer;
 	Timer spun_timer;
 	Timer bardsong_timer;
@@ -1094,7 +1098,7 @@ protected:
 	VERTEX PathingLastPosition;
 	int PathingLoopCount;
 	int PathingLastNodeVisited;
-	list<int> Route;
+	std::list<int> Route;
 	LOSType PathingLOSState;
 	Timer *PathingLOSCheckTimer;
 	Timer *PathingRouteUpdateTimerShort;
@@ -1109,9 +1113,6 @@ protected:
 	uint32 pDontSnareMeBefore;
 	uint32 pDontCureMeBefore;
 
-	// Bind wound
-	Timer bindwound_timer;
-	Mob* bindwound_target;
 	// hp event
 	int nexthpevent;
 	int nextinchpevent;