Update local fork

Merging TrinityCore:master with tkrokli:master