Admin Completo
Merge branch 'master' of https://github.com/roldanjm/PortalFinal

Conflicts:
	AdminSS/build/web/WEB-INF/classes/servletBusqueda/ServletNuevaBusqueda.class
	AdminSS/build/web/WEB-INF/classes/servletBusqueda/servletRecuperarOfertas.class
	AdminSS/build/web/WEB-INF/classes/servletPostulantes/servletPostulantes.class
	AdminSS/build/web/WEB-INF/lib/PortalSSDB.jar
	AdminSS/build/web/busqueda_detalle.jsp
	AdminSS/build/web/busqueda_listar.jsp
	AdminSS/build/web/busqueda_seleccion.jsp
	AdminSS/build/web/empresa_listar.jsp
	AdminSS/build/web/header.jsp
	AdminSS/build/web/informe_listar.jsp
	AdminSS/build/web/panelizquierdo.jsp
	AdminSS/build/web/postulante_profile.jsp
	AdminSS/build/web/postulantes_listar.jsp
	AdminSS/dist/AdminSS.war
	PortalSSDB/nbproject/project.properties