Integracion Devel

Devel Integrado Sprint 3
Merge branch 'devel_integration' into Devel

Conflicts:
	Nightrain/Assets/Models/BoxWeapon/baston.fbm.meta
	Nightrain/Assets/Models/BoxWeapon/escudo.fbm.meta
	Nightrain/Assets/Models/BoxWeapon/hacha.fbm.meta
	Nightrain/Assets/Models/NPC/Golem fire/GOLEMREAL_LAVA_TEXT.fbm.meta
	Nightrain/Assets/Models/NPC/Golem ice/GOLEMREAL_HIELO_TEXT.fbm.meta
	Nightrain/Assets/Models/NPC/Golem rock/GOLEMREAL2_TEXTROCA.fbm.meta
	Nightrain/Assets/Resources/HealthBar/Materials/bar_health.mat
	Nightrain/Assets/Scene/Level01.unity
	Nightrain/ProjectSettings/TagManager.asset