Sql for previous commits
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb
Core/Ulduar: Added IsInCombat check for ulduar teleporter
Core: Fix fail
DB/SAI: Fix sai linked error
Scripts/Commands: added option to show flags_extra (.npc info)
Merge pull request #12280 from MitchesD/commands

Scripts/Commands: added option to show flags_extra (.npc info)
Core: Fix non pch build
SQL: Restored file that was not supposed to be renamed
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb

Conflicts:
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp