kjadgsjhaghdkj
asdasd
asdasdMerge branch 'master' of https://github.com/maichel90/GestionDonaciones

Conflicts:
	.classpath
	WebContent/pages/menu.xhtml
	build/classes/co/themafia/backbean/DonanteBean.class
	build/classes/co/themafia/entities/Campanha.class
	build/classes/co/themafia/entities/Donante.class
	build/classes/co/themafia/entities/Persona.class
	build/classes/co/themafia/entities/Tipopersona.class
	build/classes/co/themafia/generaarchivo/bean/GenerarArchivoBean.class