Cambios en playerController y AngulaMovement para lo del salto (no implementado todavia)
Merge branch 'master' of https://github.com/peplopez/El-Rayo-de-Zeus
Cambios de salto y de billboard ...
Merge branch 'master' of https://github.com/peplopez/El-Rayo-de-Zeus

Conflicts:
	Exes/media/maps/blueprints.txt
	Projects/Logic/Logic.vcxproj
	Projects/Logic/Logic.vcxproj.filters
	Src/GUI/PlayerController.cpp
	Src/Logic/Entity/Components/AngularMovement.cpp
	Src/Logic/Entity/Components/AngularMovement.h
	Src/Logic/Entity/Components/JumpMovement.h
	Src/Logic/Entity/Components/LifeController.cpp