Update local fork

merge TrinityCore:master with tkrokli:master