quitar el mas
Merge origin/master

Conflicts:
	src/main/webapp/js/control/compra.js