Merge origin/master

Conflicts:
	src/java/com/fia/upeu/modelo/Validacion.java
	web/vistas_secretaria/Registrar_Solicitud.jsp
Merge origin/master

Conflicts:
	nbproject/project.properties
	web/vistas_secretaria/Validacion.jsp