r52
Merge branch 'master' into forivall-custom

Conflicts:
	HUD/resource/UI/HudMedicCharge.res