Lista convenio
Merge branch 'convenios' of https://github.com/dannyd2c2/siciud into convenios

Conflicts:
	WEB-INF/classes/cidc/convenios/db/AdminConvenioDB.class