Merge remote-tracking branch 'origin/master' into Cliente

Conflicts:
	src/java/modelo/BeanProducto.java
problemas