Merge origin/master

Conflicts:
	nbproject/project.properties
	web/vistas_secretaria/Validacion.jsp
Merge origin/master