TDB 335.56 - 2014/09/21
Merge remote-tracking branch 'origin/TDB'

Conflicts:
	src/server/game/World/World.h
fix (GainHonor) : compatibility fix for rev 56