Muestra solicitudes
Merge branch 'master' of github.com:esteoliver/SIGULAB

Conflicts:
	Nuevo30/web/WEB-INF/struts-config.xml
	Nuevo30/web/WEB-INF/tiles-defs.xml