Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Conflicts:
	src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Travis update(using fewer threads to compile to avoid malfunctions).
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb

Conflicts:
	.travis.yml
	src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp