Core/Spells: Health Funnel now always damages the warlock, even if it does not heal the pet because it's already at full health. Previously it would display the 'Miss' effect on the owner of the pet.

Fixes #9991
Merge pull request #11092 from gerripeach/pull_request

Core: add missing comment
Scripts/Misc: Coding Style unification? (by Aokromes)
Core/Spell: Shaman Bloodlust/Heroism ignore LOS

closes: #6307
Rename sql file and apply some code style. *sigh*
Rename SQL file (thx Aokromes)
Core/IoC: Fix uninitialized timer

Fix uninitialized Docks timer in Isle Of Conquest .

Valgrind log:
 Conditional jump or move depends on uninitialised value(s)
  at : BattlegroundIC::HandleCapturedNodes(ICNodePoint*, bool) (BattlegroundIC.cpp:665)
  by : BattlegroundIC::PostUpdateImpl(unsigned int) (BattlegroundIC.cpp:228)
  by : Battleground::Update(unsigned int) (Battleground.cpp:300)
  by : BattlegroundMgr::Update(unsigned int) (BattlegroundMgr.cpp:93)
  by : World::Update(unsigned int) (World.cpp:2062)
DB/SAI: This just in: Fire still hot!

By @untaught fixes #10752
DB/SAI: Add Gymer text and faction friendly to horde also.
DB/SAI: Fix scripts using SMART_TARGET_NONE that were 'broken' by 9653576cb4cc9449898d6af691c045d68e9361c5. 'Broken' is quoted because scripts using SMART_TARGET_NONE are most of the time broken by default anyway.
DB/Errors: Db error clean up

By @untaught fixes #11116
DB/SAI: Swift Discipline

By @untaught fixes #11118
DB/SAI: Cleansing the Scar

By @untaught fixes #11117
Core/Transports: Fixed double deleting IoC transports
Db/Update: Rockjaw Backbreaker script spam

By @untaught fixes #11112
Game/Battlefield:
- Remove double definition of one NPC
- Use definition instead a "magic number"
Merge pull request #11120 from AliveShiro/battlefield_cosmetic

Game/Battlefield: Cosemtic changes
Core/Chat Commands: Allow to add overlapping teles .

Allow to add overlapping teles like "abc" even if "abcde" already exists. This wasn't possible and a "Teleport already exists" error was thrown instead.
Core/Spells: Implemented additional conditions for spells that start cooldown after an event instead of after cast
Core/Transports: Correct path generation for a few transports