PowerUps terminados y 100% funcionales
Paralax Implementado
etc
DE todo
Merge commit 'b20b95ef21dd6b37b33af1a6c683aea1a9e64c59' into Alex

Conflicts:
	Clases/Factories/StateFactory.cpp
	Clases/Managers/StatusManager.cpp
	Clases/States/LevelSelectionState.cpp
	nbproject/Makefile-Debug.mk
	nbproject/Makefile-Release.mk
	status_conf.dat