Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/build-impl.xml~
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/build-impl.xml~
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/build-impl.xml~
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

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

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