TDB 335.57 - 2014/10/20
Merge remote-tracking branch 'origin/TDB'

Conflicts:
	src/server/game/World/World.h