[TW341] - Core/GameObjects: Add a 1 sec delay to hunter traps if the hunter is out of combat
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb
Buildsystem/MSVC: Warning fixes

C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
Buildsystem: Removed debugging message from cmake output
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb

Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
	src/server/scripts/Spells/spell_quest.cpp
Core/Spells: SMSG_SUPERCEDED_SPELL is now sent by an unique function.
Compile fix for previous commit. vim edition over ssh is a bad idea.
Readd G3D-v8.0_hotfix9.diff that slipped through thanks to .gitignore
Core/Misc: Fix abort() on shutdown on *nix

Wait for cliThead to exit before deleting it to about std::abort() triggered on *nix systems.
Restored character creation that was broken due to some logic errors cause by shared_ptr refactoring
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
更新
更新