cambios
Merge branch 'master' of https://github.com/jibanezg/EscaleraFX

Conflicts:
	src/com/escalera/cor/GameRequest.java