compras y ventas
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/controllers/edu/upb/upbBolsa/TransaccionesController.groovy