Corregidos errores varios
Merge remote-tracking branch 'origin/desarrollo' into desarrollo

Conflicts:
	src/main/java/es/jherranz/DecimalCollection.java