merge of Elron103/TrinityCore master

Keeping up to date