diff --git a/src/bindings/universal/Makefile.am b/src/bindings/universal/Makefile.am
index 9c605004c..2655e3aa0 100644
--- a/src/bindings/universal/Makefile.am
+++ b/src/bindings/universal/Makefile.am
@@ -25,13 +25,13 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(srcdir) -I$(srcdir)/../../../dep/include -I
 #  libmangosscript shared library will later be reused by world server daemon.
 lib_LTLIBRARIES = libmangosscript.la
 libmangosscript_la_SOURCES = \
-    ScriptMgr.cpp \
-    ScriptMgr.h \
-    config.h \
-    system.cpp \
-    Scripts/sc_default.cpp \
-    Scripts/sc_defines.cpp \
-    Scripts/sc_defines.h
+	ScriptMgr.cpp \
+	ScriptMgr.h \
+	config.h \
+	system.cpp \
+	Scripts/sc_default.cpp \
+	Scripts/sc_defines.cpp \
+	Scripts/sc_defines.h
 
 ## libtool settings
 #  API versioning
@@ -51,6 +51,6 @@ libmangosscript_la_LIBFLAGS = -version-info $(LTMANGOS_CURRENT):$(LTMANGOS_REVIS
 ## Additional files to include when running 'make dist'
 #  Scripts defaults.
 EXTRA_DIST = \
-    Scripts/sc_default.cpp \
-    Scripts/sc_defines.cpp \
-    Scripts/sc_defines.h
+	Scripts/sc_default.cpp \
+	Scripts/sc_defines.cpp \
+	Scripts/sc_defines.h
diff --git a/src/framework/Makefile.am b/src/framework/Makefile.am
index a519dad42..748d5325e 100644
--- a/src/framework/Makefile.am
+++ b/src/framework/Makefile.am
@@ -25,39 +25,39 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(srcdir)
 #  libMaNGOSScript shared library will later be reused by world server daemon.
 noinst_LIBRARIES = libmangosframework.a
 libmangosframework_a_SOURCES = \
-    Policies/ObjectLifeTime.cpp \
-    Utilities/EventProcessor.cpp
+	Policies/ObjectLifeTime.cpp \
+	Utilities/EventProcessor.cpp
 
 ## Additional files to include when running 'make dist'
 #  Source and header files for the Framework.
 EXTRA_DIST = \
-    Dynamic/FactoryHolder.h \
-    Dynamic/ObjectRegistry.h \
-    GameSystem/Grid.h \
-    GameSystem/GridLoader.h \
-    GameSystem/GridRefManager.h \
-    GameSystem/GridReference.h \
-    GameSystem/NGrid.h \
-    GameSystem/TypeContainer.h \
-    GameSystem/TypeContainerFunctions.h \
-    GameSystem/TypeContainerFunctionsPtr.h \
-    GameSystem/TypeContainerVisitor.h \
-    Network/SocketDefines.h \
-    Platform/CompilerDefs.h \
-    Platform/Define.h \
-    Policies/CreationPolicy.h \
-    Policies/ObjectLifeTime.h \
-    Policies/Singleton.h \
-    Policies/SingletonImp.h \
-    Policies/ThreadingModel.h \
-    Utilities/CountedReference/Reference.h \
-    Utilities/CountedReference/ReferenceHolder.h \
-    Utilities/CountedReference/ReferenceImpl.h \
-    Utilities/LinkedReference/RefManager.h \
-    Utilities/LinkedReference/Reference.h \
-    Utilities/ByteConverter.h \
-    Utilities/Callback.h \
-    Utilities/EventProcessor.h \
-    Utilities/UnorderedMap.h \
-    Utilities/LinkedList.h \
-    Utilities/TypeList.h
+	Dynamic/FactoryHolder.h \
+	Dynamic/ObjectRegistry.h \
+	GameSystem/Grid.h \
+	GameSystem/GridLoader.h \
+	GameSystem/GridRefManager.h \
+	GameSystem/GridReference.h \
+	GameSystem/NGrid.h \
+	GameSystem/TypeContainer.h \
+	GameSystem/TypeContainerFunctions.h \
+	GameSystem/TypeContainerFunctionsPtr.h \
+	GameSystem/TypeContainerVisitor.h \
+	Network/SocketDefines.h \
+	Platform/CompilerDefs.h \
+	Platform/Define.h \
+	Policies/CreationPolicy.h \
+	Policies/ObjectLifeTime.h \
+	Policies/Singleton.h \
+	Policies/SingletonImp.h \
+	Policies/ThreadingModel.h \
+	Utilities/CountedReference/Reference.h \
+	Utilities/CountedReference/ReferenceHolder.h \
+	Utilities/CountedReference/ReferenceImpl.h \
+	Utilities/LinkedReference/RefManager.h \
+	Utilities/LinkedReference/Reference.h \
+	Utilities/ByteConverter.h \
+	Utilities/Callback.h \
+	Utilities/EventProcessor.h \
+	Utilities/UnorderedMap.h \
+	Utilities/LinkedList.h \
+	Utilities/TypeList.h
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index a162214ca..2b10e7b6e 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -28,261 +28,261 @@ noinst_LIBRARIES = libmangosgame.a
 
 #  libmangossgame library will later be reused by ...
 libmangosgame_a_SOURCES = \
-    AccountMgr.cpp \
-    AccountMgr.h \
-    AchievementMgr.h \
-    AchievementMgr.cpp \
-    AddonHandler.cpp \
-    AddonHandler.h \
-    AggressorAI.cpp \
-    AggressorAI.h \
-    AnimalRandomMovementGenerator.h \
-    ArenaTeam.cpp \
-    ArenaTeam.h \
-    ArenaTeamHandler.cpp \
-    AuctionHouseHandler.cpp \
-    AuctionHouseMgr.cpp \
-    AuctionHouseMgr.h \
-    Bag.cpp \
-    Bag.h \
-    BattleGround.cpp \
-    BattleGroundAA.cpp \
-    BattleGroundAB.cpp \
-    BattleGroundAV.cpp \
-    BattleGroundBE.cpp \
-    BattleGroundDS.cpp \
-    BattleGroundEY.cpp \
-    BattleGroundNA.cpp \
-    BattleGroundRL.cpp \
-    BattleGroundRV.cpp \
-    BattleGroundSA.cpp \
-    BattleGroundWS.cpp \
-    BattleGround.h \
-    BattleGroundAA.h \
-    BattleGroundAB.h \
-    BattleGroundAV.h \
-    BattleGroundBE.h \
-    BattleGroundDS.h \
-    BattleGroundEY.h \
-    BattleGroundNA.h \
-    BattleGroundRL.h \
-    BattleGroundRV.h \
-    BattleGroundSA.h \
-    BattleGroundWS.h \
-    BattleGroundHandler.cpp \
-    BattleGroundMgr.cpp \
-    BattleGroundMgr.h \
-    Calendar.cpp \
-    Calendar.h \
-    CalendarHandler.cpp \
-    Cell.h \
-    CellImpl.h \
-    Channel.cpp \
-    Channel.h \
-    ChannelHandler.cpp \
-    ChannelMgr.h \
-    CharacterHandler.cpp \
-    Chat.cpp \
-    Chat.h \
-    ChatHandler.cpp \
-    CombatHandler.cpp \
-    ConfusedMovementGenerator.cpp \
-    ConfusedMovementGenerator.h \
-    Corpse.cpp \
-    Corpse.h \
-    CreatureAI.cpp \
-    CreatureAI.h \
-    CreatureAIImpl.h \
-    CreatureAIRegistry.cpp \
-    CreatureAIRegistry.h \
-    CreatureAISelector.cpp \
-    CreatureAISelector.h \
-    Creature.cpp \
-    Creature.h \
-    debugcmds.cpp \
-    DestinationHolder.cpp \
-    DestinationHolder.h \
-    DestinationHolderImp.h \
-    DuelHandler.cpp \
-    DynamicObject.cpp \
-    DynamicObject.h \
-    FleeingMovementGenerator.cpp \
-    FleeingMovementGenerator.h \
-    Formulas.h \
-    GameEvent.cpp \
-    GameEvent.h \
-    GameObject.cpp \
-    GameObject.h \
-    GlobalEvents.cpp \
-    GlobalEvents.h \
-    GMTicketHandler.cpp \
-    GMTicketMgr.cpp \
-    GMTicketMgr.h \
-    GossipDef.cpp \
-    GossipDef.h \
-    GridDefines.h \
-    GridNotifiers.cpp \
-    GridNotifiers.h \
-    GridNotifiersImpl.h \
-    GridStates.cpp \
-    GridStates.h \
-    Group.cpp \
-    Group.h \
-    GroupHandler.cpp \
-    GuardAI.cpp \
-    GuardAI.h \
-    Guild.cpp \
-    Guild.h \
-    GuildHandler.cpp \
-    HomeMovementGenerator.cpp \
-    HomeMovementGenerator.h \
-    HostilRefManager.cpp \
-    HostilRefManager.h \
-    IdleMovementGenerator.cpp \
-    IdleMovementGenerator.h \
-    InstanceData.cpp \
-    InstanceData.h \
-    InstanceSaveMgr.cpp \
-    InstanceSaveMgr.h \
-    Item.cpp \
-    Item.h \
-    ItemEnchantmentMgr.cpp \
-    ItemEnchantmentMgr.h \
-    ItemHandler.cpp \
-    ItemPrototype.h \
-    Language.h \
-    Level0.cpp \
-    Level1.cpp \
-    Level2.cpp \
-    Level3.cpp \
-    LFGHandler.cpp \
-    LootHandler.cpp \
-    LootMgr.cpp \
-    LootMgr.h \
-    Mail.cpp \
-    Mail.h \
-    Map.cpp \
-    Map.h \
-    MapInstanced.cpp \
-    MapInstanced.h \
-    MapManager.cpp \
-    MapManager.h \
-    MapReference.h \
-    MapRefManager.h \
-    MiscHandler.cpp \
-    MotionMaster.cpp \
-    MotionMaster.h \
-    MovementGenerator.cpp \
-    MovementGenerator.h \
-    MovementGeneratorImpl.h \
-    MovementHandler.cpp \
-    NPCHandler.cpp \
-    NPCHandler.h \
-    NullCreatureAI.cpp \
-    NullCreatureAI.h \
-    ObjectAccessor.cpp \
-    ObjectAccessor.h \
-    Object.cpp \
-    ObjectDefines.h \
-    ObjectGridLoader.cpp \
-    ObjectGridLoader.h \
-    Object.h \
-    ObjectMgr.cpp \
-    ObjectMgr.h \
-    ObjectPosSelector.cpp \
-    ObjectPosSelector.h \
-    Opcodes.cpp \
-    Opcodes.h \
-    Path.h \
-    PetAI.cpp \
-    PetAI.h \
-    Pet.cpp \
-    Pet.h \
-    PetHandler.cpp \
-    PetitionsHandler.cpp \
-    Player.cpp \
-    Player.h \
-    PlayerDump.cpp \
-    PlayerDump.h \
-    PointMovementGenerator.cpp \
-    PointMovementGenerator.h \
-    PoolHandler.cpp \
-    PoolHandler.h \
-    QueryHandler.cpp \
-    QuestDef.cpp \
-    QuestDef.h \
-    QuestHandler.cpp \
-    RandomMovementGenerator.cpp \
-    RandomMovementGenerator.h \
-    ReactorAI.cpp \
-    ReactorAI.h \
-    ScriptCalls.cpp \
-    ScriptCalls.h \
-    SharedDefines.h \
-    SkillHandler.cpp \
-    SpellAuraDefines.h \
-    SpellAuras.cpp \
-    SpellAuras.h \
-    Spell.cpp \
-    SpellEffects.cpp \
-    Spell.h \
-    SkillDiscovery.cpp \
-    SkillDiscovery.h \
-    SkillExtraItems.cpp \
-    SkillExtraItems.h \
-    SpellHandler.cpp \
-    SocialMgr.cpp \
-    SocialMgr.h \
-    SpellMgr.cpp \
-    SpellMgr.h \
-    StatSystem.cpp \
-    TargetedMovementGenerator.cpp \
-    TargetedMovementGenerator.h \
-    TaxiHandler.cpp \
-    TemporarySummon.cpp \
-    TemporarySummon.h \
-    TotemAI.cpp \
-    TotemAI.h \
-    Totem.cpp \
-    Totem.h \
-    TradeHandler.cpp \
-    Transports.cpp \
-    Transports.h \
-    ThreatManager.cpp \
-    ThreatManager.h \
-    Traveller.h \
-    Unit.cpp \
-    Unit.h \
-    UnitEvents.h \
-    UpdateData.cpp \
-    UpdateData.h \
-    UpdateFields.h \
-    UpdateMask.h \
-    Vehicle.cpp \
-    Vehicle.h \
-    VoiceChatHandler.cpp \
-    WaypointManager.cpp \
-    WaypointManager.h \
-    WaypointMovementGenerator.cpp \
-    WaypointMovementGenerator.h \
-    Weather.cpp \
-    Weather.h \
-    World.cpp \
-    World.h \
-    WorldLog.cpp \
-    WorldLog.h \
-    WorldSession.cpp \
-    WorldSession.h \
-    WorldSocket.cpp \
-    WorldSocket.h \
-    WorldSocketMgr.cpp \
-    WorldSocketMgr.h \
-    FollowerReference.cpp \
-    FollowerReference.h \
-    FollowerRefManager.h \
-    GroupReference.cpp \
-    GroupReference.h \
-    GroupRefManager.h
+	AccountMgr.cpp \
+	AccountMgr.h \
+	AchievementMgr.h \
+	AchievementMgr.cpp \
+	AddonHandler.cpp \
+	AddonHandler.h \
+	AggressorAI.cpp \
+	AggressorAI.h \
+	AnimalRandomMovementGenerator.h \
+	ArenaTeam.cpp \
+	ArenaTeam.h \
+	ArenaTeamHandler.cpp \
+	AuctionHouseHandler.cpp \
+	AuctionHouseMgr.cpp \
+	AuctionHouseMgr.h \
+	Bag.cpp \
+	Bag.h \
+	BattleGround.cpp \
+	BattleGroundAA.cpp \
+	BattleGroundAB.cpp \
+	BattleGroundAV.cpp \
+	BattleGroundBE.cpp \
+	BattleGroundDS.cpp \
+	BattleGroundEY.cpp \
+	BattleGroundNA.cpp \
+	BattleGroundRL.cpp \
+	BattleGroundRV.cpp \
+	BattleGroundSA.cpp \
+	BattleGroundWS.cpp \
+	BattleGround.h \
+	BattleGroundAA.h \
+	BattleGroundAB.h \
+	BattleGroundAV.h \
+	BattleGroundBE.h \
+	BattleGroundDS.h \
+	BattleGroundEY.h \
+	BattleGroundNA.h \
+	BattleGroundRL.h \
+	BattleGroundRV.h \
+	BattleGroundSA.h \
+	BattleGroundWS.h \
+	BattleGroundHandler.cpp \
+	BattleGroundMgr.cpp \
+	BattleGroundMgr.h \
+	Calendar.cpp \
+	Calendar.h \
+	CalendarHandler.cpp \
+	Cell.h \
+	CellImpl.h \
+	Channel.cpp \
+	Channel.h \
+	ChannelHandler.cpp \
+	ChannelMgr.h \
+	CharacterHandler.cpp \
+	Chat.cpp \
+	Chat.h \
+	ChatHandler.cpp \
+	CombatHandler.cpp \
+	ConfusedMovementGenerator.cpp \
+	ConfusedMovementGenerator.h \
+	Corpse.cpp \
+	Corpse.h \
+	CreatureAI.cpp \
+	CreatureAI.h \
+	CreatureAIImpl.h \
+	CreatureAIRegistry.cpp \
+	CreatureAIRegistry.h \
+	CreatureAISelector.cpp \
+	CreatureAISelector.h \
+	Creature.cpp \
+	Creature.h \
+	debugcmds.cpp \
+	DestinationHolder.cpp \
+	DestinationHolder.h \
+	DestinationHolderImp.h \
+	DuelHandler.cpp \
+	DynamicObject.cpp \
+	DynamicObject.h \
+	FleeingMovementGenerator.cpp \
+	FleeingMovementGenerator.h \
+	Formulas.h \
+	GameEvent.cpp \
+	GameEvent.h \
+	GameObject.cpp \
+	GameObject.h \
+	GlobalEvents.cpp \
+	GlobalEvents.h \
+	GMTicketHandler.cpp \
+	GMTicketMgr.cpp \
+	GMTicketMgr.h \
+	GossipDef.cpp \
+	GossipDef.h \
+	GridDefines.h \
+	GridNotifiers.cpp \
+	GridNotifiers.h \
+	GridNotifiersImpl.h \
+	GridStates.cpp \
+	GridStates.h \
+	Group.cpp \
+	Group.h \
+	GroupHandler.cpp \
+	GuardAI.cpp \
+	GuardAI.h \
+	Guild.cpp \
+	Guild.h \
+	GuildHandler.cpp \
+	HomeMovementGenerator.cpp \
+	HomeMovementGenerator.h \
+	HostilRefManager.cpp \
+	HostilRefManager.h \
+	IdleMovementGenerator.cpp \
+	IdleMovementGenerator.h \
+	InstanceData.cpp \
+	InstanceData.h \
+	InstanceSaveMgr.cpp \
+	InstanceSaveMgr.h \
+	Item.cpp \
+	Item.h \
+	ItemEnchantmentMgr.cpp \
+	ItemEnchantmentMgr.h \
+	ItemHandler.cpp \
+	ItemPrototype.h \
+	Language.h \
+	Level0.cpp \
+	Level1.cpp \
+	Level2.cpp \
+	Level3.cpp \
+	LFGHandler.cpp \
+	LootHandler.cpp \
+	LootMgr.cpp \
+	LootMgr.h \
+	Mail.cpp \
+	Mail.h \
+	Map.cpp \
+	Map.h \
+	MapInstanced.cpp \
+	MapInstanced.h \
+	MapManager.cpp \
+	MapManager.h \
+	MapReference.h \
+	MapRefManager.h \
+	MiscHandler.cpp \
+	MotionMaster.cpp \
+	MotionMaster.h \
+	MovementGenerator.cpp \
+	MovementGenerator.h \
+	MovementGeneratorImpl.h \
+	MovementHandler.cpp \
+	NPCHandler.cpp \
+	NPCHandler.h \
+	NullCreatureAI.cpp \
+	NullCreatureAI.h \
+	ObjectAccessor.cpp \
+	ObjectAccessor.h \
+	Object.cpp \
+	ObjectDefines.h \
+	ObjectGridLoader.cpp \
+	ObjectGridLoader.h \
+	Object.h \
+	ObjectMgr.cpp \
+	ObjectMgr.h \
+	ObjectPosSelector.cpp \
+	ObjectPosSelector.h \
+	Opcodes.cpp \
+	Opcodes.h \
+	Path.h \
+	PetAI.cpp \
+	PetAI.h \
+	Pet.cpp \
+	Pet.h \
+	PetHandler.cpp \
+	PetitionsHandler.cpp \
+	Player.cpp \
+	Player.h \
+	PlayerDump.cpp \
+	PlayerDump.h \
+	PointMovementGenerator.cpp \
+	PointMovementGenerator.h \
+	PoolHandler.cpp \
+	PoolHandler.h \
+	QueryHandler.cpp \
+	QuestDef.cpp \
+	QuestDef.h \
+	QuestHandler.cpp \
+	RandomMovementGenerator.cpp \
+	RandomMovementGenerator.h \
+	ReactorAI.cpp \
+	ReactorAI.h \
+	ScriptCalls.cpp \
+	ScriptCalls.h \
+	SharedDefines.h \
+	SkillHandler.cpp \
+	SpellAuraDefines.h \
+	SpellAuras.cpp \
+	SpellAuras.h \
+	Spell.cpp \
+	SpellEffects.cpp \
+	Spell.h \
+	SkillDiscovery.cpp \
+	SkillDiscovery.h \
+	SkillExtraItems.cpp \
+	SkillExtraItems.h \
+	SpellHandler.cpp \
+	SocialMgr.cpp \
+	SocialMgr.h \
+	SpellMgr.cpp \
+	SpellMgr.h \
+	StatSystem.cpp \
+	TargetedMovementGenerator.cpp \
+	TargetedMovementGenerator.h \
+	TaxiHandler.cpp \
+	TemporarySummon.cpp \
+	TemporarySummon.h \
+	TotemAI.cpp \
+	TotemAI.h \
+	Totem.cpp \
+	Totem.h \
+	TradeHandler.cpp \
+	Transports.cpp \
+	Transports.h \
+	ThreatManager.cpp \
+	ThreatManager.h \
+	Traveller.h \
+	Unit.cpp \
+	Unit.h \
+	UnitEvents.h \
+	UpdateData.cpp \
+	UpdateData.h \
+	UpdateFields.h \
+	UpdateMask.h \
+	Vehicle.cpp \
+	Vehicle.h \
+	VoiceChatHandler.cpp \
+	WaypointManager.cpp \
+	WaypointManager.h \
+	WaypointMovementGenerator.cpp \
+	WaypointMovementGenerator.h \
+	Weather.cpp \
+	Weather.h \
+	World.cpp \
+	World.h \
+	WorldLog.cpp \
+	WorldLog.h \
+	WorldSession.cpp \
+	WorldSession.h \
+	WorldSocket.cpp \
+	WorldSocket.h \
+	WorldSocketMgr.cpp \
+	WorldSocketMgr.h \
+	FollowerReference.cpp \
+	FollowerReference.h \
+	FollowerRefManager.h \
+	GroupReference.cpp \
+	GroupReference.h \
+	GroupRefManager.h
 
 ## Link against shared library
 libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/vmap/libmangosvmaps.a
diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am
index 73a385d4e..b7106cc4f 100644
--- a/src/mangosd/Makefile.am
+++ b/src/mangosd/Makefile.am
@@ -22,15 +22,15 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir)/../../
 ## Build world list daemon as standalone program
 bin_PROGRAMS = mangos-worldd
 mangos_worldd_SOURCES = \
-    CliRunnable.cpp \
-    CliRunnable.h \
-    Main.cpp \
-    Master.cpp \
-    Master.h \
-    RASocket.cpp \
-    RASocket.h \
-    WorldRunnable.cpp \
-    WorldRunnable.h
+	CliRunnable.cpp \
+	CliRunnable.h \
+	Main.cpp \
+	Master.cpp \
+	Master.h \
+	RASocket.cpp \
+	RASocket.h \
+	WorldRunnable.cpp \
+	WorldRunnable.h
 
 ## Link world daemon against the shared library
 mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
@@ -39,22 +39,23 @@ mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../
 ## Additional files to include when running 'make dist'
 #  Include world daemon configuration
 EXTRA_DIST = \
-    mangosd.conf.dist
+	mangosd.conf.dist
 
 ## Additional files to install
 sysconf_DATA = \
-    mangosd.conf.dist
+	mangosd.conf.dist
 
 install-data-hook:
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-      dest=`echo $$p | sed -e s/.dist//`; \
-      if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
-        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
-      else \
-        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
-        $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
-      fi; \
-    done
+	@list='$(sysconf_DATA)'
+	for p in $$list; do \
+		dest=`echo $$p | sed -e s/.dist//`; \
+		if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
+			echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
+		else \
+			echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
+			$(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
+		fi; \
+	done
 
 clean-local:
 	rm -f $(sysconf_DATA)
diff --git a/src/realmd/Makefile.am b/src/realmd/Makefile.am
index 6de5189c3..38e1bdd61 100644
--- a/src/realmd/Makefile.am
+++ b/src/realmd/Makefile.am
@@ -22,12 +22,12 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir)/../../
 ## Build realm list daemon as standalone program
 bin_PROGRAMS = mangos-realmd
 mangos_realmd_SOURCES = \
-    AuthCodes.h \
-    AuthSocket.cpp \
-    AuthSocket.h \
-    Main.cpp \
-    RealmList.cpp \
-    RealmList.h
+	AuthCodes.h \
+	AuthSocket.cpp \
+	AuthSocket.h \
+	Main.cpp \
+	RealmList.cpp \
+	RealmList.h
 
 ## Link realm list daemon against the shared library
 mangos_realmd_LDADD = ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a ../../dep/src/zthread/libZThread.la
@@ -36,22 +36,23 @@ mangos_realmd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L$(libd
 ## Additional files to include when running 'make dist'
 #  Include realm list daemon configuration
 EXTRA_DIST = \
-    realmd.conf.dist
+	realmd.conf.dist
 
 ## Additional files to install
 sysconf_DATA = \
-    realmd.conf.dist
+	realmd.conf.dist
 
 install-data-hook:
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-      dest=`echo $$p | sed -e s/.dist//`; \
-      if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
-        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
-      else \
-        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
-        $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
-      fi; \
-    done
+	@list='$(sysconf_DATA)'
+	for p in $$list; do \
+		dest=`echo $$p | sed -e s/.dist//`; \
+		if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
+			echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
+		else \
+			echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
+			$(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
+		fi; \
+	done
 
 clean-local:
 	rm -f $(sysconf_DATA)
diff --git a/src/shared/Auth/Makefile.am b/src/shared/Auth/Makefile.am
index b7a2de5fc..9e4956711 100644
--- a/src/shared/Auth/Makefile.am
+++ b/src/shared/Auth/Makefile.am
@@ -27,13 +27,13 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(sr
 noinst_LIBRARIES = libmangosauth.a
 
 libmangosauth_a_SOURCES = \
-    AuthCrypt.cpp \
-    AuthCrypt.h \
-    BigNumber.cpp \
-    BigNumber.h \
-    Hmac.cpp \
-    Hmac.h \
-    Sha1.cpp \
-    Sha1.h \
-    md5.c \
-    md5.h
+	AuthCrypt.cpp \
+	AuthCrypt.h \
+	BigNumber.cpp \
+	BigNumber.h \
+	Hmac.cpp \
+	Hmac.h \
+	Sha1.cpp \
+	Sha1.h \
+	md5.c \
+	md5.h
diff --git a/src/shared/Database/Makefile.am b/src/shared/Database/Makefile.am
index 31c24917b..f9de9576f 100644
--- a/src/shared/Database/Makefile.am
+++ b/src/shared/Database/Makefile.am
@@ -27,38 +27,38 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(sr
 noinst_LIBRARIES = libmangosdatabase.a
 
 libmangosdatabase_a_SOURCES = \
-    DBCStores.cpp \
-    DBCStores.h \
-    DBCStructure.h \
-    DBCfmt.cpp \
-    Database.cpp \
-    Database.h \
-    DatabaseEnv.h \
-    DatabaseImpl.h \
-    DatabaseMysql.cpp \
-    DatabasePostgre.cpp \
-    DatabaseMysql.h \
-    DatabasePostgre.h \
-    DatabaseSqlite.cpp \
-    DatabaseSqlite.h \
-    DBCEnums.h \
-    Field.cpp \
-    Field.h \
-    MySQLDelayThread.h \
-    PGSQLDelayThread.h \
-    QueryResult.h \
-    QueryResultMysql.cpp \
-    QueryResultMysql.h \
-    QueryResultPostgre.cpp \
-    QueryResultPostgre.h \
-    QueryResultSqlite.cpp \
-    QueryResultSqlite.h \
-    SQLStorage.cpp \
-    SQLStorage.h \
-    SQLStorageImpl.h \
-    SqlDelayThread.cpp \
-    SqlDelayThread.h \
-    SqlOperations.cpp \
-    SqlOperations.h \
-    dbcfile.cpp \
-    dbcfile.h
+	DBCStores.cpp \
+	DBCStores.h \
+	DBCStructure.h \
+	DBCfmt.cpp \
+	Database.cpp \
+	Database.h \
+	DatabaseEnv.h \
+	DatabaseImpl.h \
+	DatabaseMysql.cpp \
+	DatabasePostgre.cpp \
+	DatabaseMysql.h \
+	DatabasePostgre.h \
+	DatabaseSqlite.cpp \
+	DatabaseSqlite.h \
+	DBCEnums.h \
+	Field.cpp \
+	Field.h \
+	MySQLDelayThread.h \
+	PGSQLDelayThread.h \
+	QueryResult.h \
+	QueryResultMysql.cpp \
+	QueryResultMysql.h \
+	QueryResultPostgre.cpp \
+	QueryResultPostgre.h \
+	QueryResultSqlite.cpp \
+	QueryResultSqlite.h \
+	SQLStorage.cpp \
+	SQLStorage.h \
+	SQLStorageImpl.h \
+	SqlDelayThread.cpp \
+	SqlDelayThread.h \
+	SqlOperations.cpp \
+	SqlOperations.h \
+	dbcfile.cpp \
+	dbcfile.h
diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am
index 087f0ec20..f4533e4c2 100644
--- a/src/shared/Makefile.am
+++ b/src/shared/Makefile.am
@@ -30,24 +30,24 @@ noinst_LIBRARIES = libmangosshared.a
 
 #  libmangosshared library will later be reused by ...
 libmangosshared_a_SOURCES = \
-    Base.cpp \
-    Base.h \
-    ByteBuffer.h \
-    Common.cpp \
-    Common.h \
-    Errors.h \
-    Log.cpp \
-    Log.h \
-    MemoryLeaks.cpp \
-    MemoryLeaks.h \
-    ProgressBar.cpp \
-    ProgressBar.h \
-    Timer.h \
-    Util.cpp \
-    Util.h \
-    WorldPacket.h \
-    revision_nr.h \
-    revision.h
+	Base.cpp \
+	Base.h \
+	ByteBuffer.h \
+	Common.cpp \
+	Common.h \
+	Errors.h \
+	Log.cpp \
+	Log.h \
+	MemoryLeaks.cpp \
+	MemoryLeaks.h \
+	ProgressBar.cpp \
+	ProgressBar.h \
+	Timer.h \
+	Util.cpp \
+	Util.h \
+	WorldPacket.h \
+	revision_nr.h \
+	revision.h
 
 # Get revision (git or svn)
 REVISION_FILE = revision.h
@@ -63,16 +63,16 @@ $(REVISION_FILE) : $(top_builddir)/src/tools/genrevision/genrevision FORCE
 ## Additional files to include when running 'make dist'
 #  Disabled packet logger
 EXTRA_DIST = \
-    PacketLog.cpp \
-    PacketLog.h
+	PacketLog.cpp \
+	PacketLog.h
 
 # System configuration
 EXTRA_DIST += \
-    SystemConfig.h
+	SystemConfig.h
 
 # System Win32 files
 EXTRA_DIST += \
-    ServiceWin32.cpp \
-    ServiceWin32.h \
-    WheatyExceptionReport.cpp \
-    WheatyExceptionReport.h
+	ServiceWin32.cpp \
+	ServiceWin32.h \
+	WheatyExceptionReport.cpp \
+	WheatyExceptionReport.h
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index ee3af12e8..87d3beae2 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7355"
+ #define REVISION_NR "7356"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/vmap/Makefile.am b/src/shared/vmap/Makefile.am
index 14ace12f0..8ebbb1e04 100644
--- a/src/shared/vmap/Makefile.am
+++ b/src/shared/vmap/Makefile.am
@@ -27,30 +27,30 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(sr
 noinst_LIBRARIES = libmangosvmaps.a
 
 libmangosvmaps_a_SOURCES = \
-    AABSPTree.h \
-    BaseModel.cpp \
-    BaseModel.h \
-    CoordModelMapping.cpp \
-    CoordModelMapping.h \
-    DebugCmdLogger.cpp \
-    DebugCmdLogger.h \
-    IVMapManager.h \
-    ManagedModelContainer.cpp \
-    ManagedModelContainer.h \
-    ModelContainer.cpp \
-    ModelContainer.h \
-    NodeValueAccess.h \
-    ShortBox.h \
-    ShortVector.h \
-    SubModel.cpp \
-    SubModel.h \
-    TileAssembler.cpp \
-    TileAssembler.h \
-    TreeNode.cpp \
-    TreeNode.h \
-    VMapDefinitions.h \
-    VMapFactory.cpp \
-    VMapFactory.h \
-    VMapManager.cpp \
-    VMapManager.h \
-    VMapTools.h
+	AABSPTree.h \
+	BaseModel.cpp \
+	BaseModel.h \
+	CoordModelMapping.cpp \
+	CoordModelMapping.h \
+	DebugCmdLogger.cpp \
+	DebugCmdLogger.h \
+	IVMapManager.h \
+	ManagedModelContainer.cpp \
+	ManagedModelContainer.h \
+	ModelContainer.cpp \
+	ModelContainer.h \
+	NodeValueAccess.h \
+	ShortBox.h \
+	ShortVector.h \
+	SubModel.cpp \
+	SubModel.h \
+	TileAssembler.cpp \
+	TileAssembler.h \
+	TreeNode.cpp \
+	TreeNode.h \
+	VMapDefinitions.h \
+	VMapFactory.cpp \
+	VMapFactory.h \
+	VMapManager.cpp \
+	VMapManager.h \
+	VMapTools.h