TDB 335.54 - 2014/07/05
Merge commit TDB 335.54 into CustomConfigs

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