issue 122

Este commit es para cerrar la issue 122.
Merge branch 'devel_c_Terrain_s4_issue#122' into devel_c

Conflicts:
	Nightrain/Assets/Extern/Terrain Assets/Trees Ambient-Occlusion/Materials/alder-alderbark.mat
	Nightrain/Assets/Materials/picso.mat
	Nightrain/Assets/Materials/puerta.mat
	Nightrain/Assets/Models/Midieval Village Kit/Source/FBX/Materials/atlas.mat
	Nightrain/Assets/Resources/HealthBar/Materials/bar_health.mat
	Nightrain/Assets/Scene/Level01.unity
	Nightrain/Assets/Terrains/Level01/scenario01.asset