Reporte y controlador ya copiado
Merge branch 'fase2' of https://github.com/TinPY/SISGAP into fase2

Conflicts:
	SISGAP/src/main/java/ar/edu/undec/sisgap/controller/view/ProyectoController.java
	SISGAP/src/main/webapp/secure/reportes/solicitud.jrxml