更新
Merge branch 'ghbb2' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Events/GameEventMgr.cpp