* merge 4793

[biglad]

* merge 4793

src/game/Channel.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/Channel.cpp) (7 lines added, 7 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/World.cpp) (2 lines added, 2 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/BattleGround.cpp) (2 lines added, 0 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/SpellEffects.cpp) (49 lines added, 6 lines removed)
src/game/AuctionHouseHandler.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/AuctionHouseHandler.cpp) (1 lines added, 1 lines removed)
src/game/Creature.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/Creature.cpp) (1 lines added, 1 lines removed)
src/game/SpellAuras.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/SpellAuras.cpp) (73 lines added, 19 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/game/AchievementMgr.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/AchievementMgr.cpp) (1 lines added, 1 lines removed)
win/VC80/TrinityCore.vcproj (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/win/VC80/TrinityCore.vcproj) (4 lines added, 4 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/8c0d05cb47ff/src/game/Player.cpp) (91 lines added, 113 lines removed)



More... (http://bitbucket.org/Azrael/mgacore2/changeset/8c0d05cb47ff/)