Update local repository

merge TrinityCore:master into tkrokli:master