TDB 335.54 - 2014/07/05
Merge commit 'TDB 335.54' into AdaptiveLevel

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