Cambios en caracteristicas (con errores)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/fiuba/algo3/Dominio/Ladron/Ladron.java
	test/fiuba/algo3/LadronTestCase.java