asdfghjklghknbgftyuk
Merge branch 'master' of https://github.com/educhoko91/UPBBolsa

Conflicts:
	grails-app/domain/edu/upb/upbBolsa/Pagos.groovy
	grails-app/domain/edu/upb/upbBolsa/Transacciones.groovy
Merge branch 'master' of https://github.com/educhoko91/UPBBolsa