New conf organisation
Merge branch 'master' of https://github.com/Twistyx/TrinityCore
Finish conf changes