balance
merch1
Merge branch 'convenios' of https://github.com/dannyd2c2/siciud into convenios

Conflicts:
	work/org/apache/jsp/adminConvenio/EntidadConvenio_jsp.class
	work/org/apache/jsp/adminConvenio/Verconvenio_jsp.class