LOGIN CORREGIDO y CONFIRMAR COMPRA CORREGIDO
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/web/Comprar.jsp
	nbproject/private/private.properties
	nbproject/project.properties
	web/Comprar.jsp