Update local repository

merge TrinityCore:master with local:master