Commit "basura"
Merge remote-tracking branch 'origin/Devel' into Devel

Conflicts:
	Nightrain/Assets/Resources/HealthBar/Materials/bar_health.mat
	Nightrain/Assets/Resources/HealthBar/Materials/damage_health.mat