*Merge.

--HG--
branch : trunk

src/game/Creature.cpp

@@ -199,10 +199,10 @@ void Creature::RemoveFromWorld()
 void Creature::SearchFormation()
 {
 	uint32 lowguid = GetDBTableGUIDLow();
-	
+
 	if(CreatureGroupMap.find(lowguid) != CreatureGroupMap.end())
 	{
-		m_formationID = CreatureGroupMap[lowguid]->leaderGUID;	
+		m_formationID = CreatureGroupMap[lowguid]->leaderGUID;
 		formation_mgr.UpdateCreatureGroup(m_formationID, this);
 	}
 }
@@ -415,7 +415,7 @@ void Creature::Update(uint32 diff)
 
                 CreatureInfo const *cinfo = GetCreatureInfo();
 				SelectLevel(cinfo);
-                
+
                 if (m_isDeadByDefault)
                 {
                     setDeathState(JUST_DIED);
@@ -1425,7 +1425,7 @@ bool Creature::LoadFromDB(uint32 guid, Map *map)
     }
 	//We should set first home position, because then AI calls home movement
 	SetHomePosition(data->posX,data->posY,data->posZ,data->orientation);
-    
+
 	m_respawnradius = data->spawndist;
 
     m_respawnDelay = data->spawntimesecs;