Update local fork

Merge new commits into tkrokli:TrinityCore from TrinityCore:master