Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Conflicts:
	src/server/scripts/EasternKingdoms/zone_duskwood.cpp
Fix build.
Core/Misc: Remove Unit::Get* wrappers for ObjectAccessor::Get*
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb

Conflicts:
	src/server/scripts/Custom/WorldEvents/TW_pilgrim.cpp
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb

Conflicts:
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp