Koth fix

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

Conflicts:
	src/server/game/Koth/Koth.cpp