Mas cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/web/WEB-INF/classes/BD/BBDD.class
	build/web/WEB-INF/classes/BD/DatosAdmin.class
	build/web/WEB-INF/classes/BD/DatosUsuario.class
	build/web/WEB-INF/classes/Modelo/Compra.class
	build/web/WEB-INF/classes/Modelo/DetalleCompra.class
	build/web/WEB-INF/classes/Modelo/Producto.class
	build/web/WEB-INF/classes/Modelo/Usuario.class
	build/web/WEB-INF/classes/Servlets/ConfirmarCompra.class
	nbproject/private/private.properties
	nbproject/private/private.xml