Merge origin/master

Conflicts:
	src/main/webapp/paginas/admin/listProfile.xhtml
	src/main/webapp/paginas/secretario/solicitud/lista.xhtml
Merge origin/master
Merge origin/master

Conflicts:
	src/main/webapp/paginas/admin/listProfile.xhtml
	src/main/webapp/paginas/secretario/solicitud/lista.xhtml