Update local branch from TC master

merge TrinityCore/TrinityCore/master with tkrokli/TrinityCore/master