1
Merge branch 'master' of https://github.com/Softgreen/SistCoop.git

Conflicts:
	SistCoopJefeCajaApp/src/main/webapp/scripts/controllers/transaccion/CrearTransaccionBovedaBovedaController.js
	SistCoopJefeCajaApp/src/main/webapp/scripts/controllers/voucher/VoucherTransaccionBovedaBovedaController.js
	SistCoopJefeCajaApp/src/main/webapp/views/jefeCaja/voucher/transaccionBovedaBovedaVoucher.html