[TW342] remove repeated code and clean it up a bit
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb2
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb
更新
Merge branch 'ghbb2' of https://github.com/shenhuyong/TrinityCore into ghbb
Update 2014_07_19_00_world_spell_custom_attr.sql
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	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
Travis update
DB/Creature: Remove wrong aura on Monstrous Kaliri
Close #12563
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb

Conflicts:
	.travis.yml
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp