commit debug para mergear lo de fran
Merge branch 'master' of https://github.com/franaisa/Gloom

Conflicts:
	Src/Logic/Entity/Components/AvatarController.cpp
Merge branch 'master' of https://github.com/franaisa/Gloom