Revert "Merge with jose"

This reverts commit ddc0097f27b876cab531462ce7a4b791e91b0f5b.

Conflicts:
	Universales/StageState.cpp
	Universales/StageState.cpp.orig
	Universales/StateData.cpp
	Universales/config.bin
	Universales/save.bin