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

Conflicts:
	src/server/scripts/EasternKingdoms/zone_duskwood.cpp
Fix build.
Merge remote-tracking branch 'truewow/master'