merge of Elron103/TrinityCore master

updated