mejoras para sprint 2
Merge remote-tracking branch 'origin/devel_c_Terrain_s2_issue#43' into devel_c

Conflicts:
	Nightrain/Assets/Models/Barriles/barril.fbm.meta
	Nightrain/Assets/Models/NPC/golem_armature.fbm.meta
	Nightrain/Assets/Scene/Level01.unity