Git:Merge with TrinityCore/master
BG/CF some Fixes...