Update local repository

merge TrinityCore:master with tkrokli:master