shadow progress
Merge branch 'master' into pr/n38_TENFIRE

Conflicts:
	CodenameGamma/Screen/PlayScreen/Graphics/GraphicsManager.h
cleanup