Merge pull request #1

from TrinityCore/TrinityCore master