Se agrega la carpeta nbproject
Se agrega el upload de CV
Commit
Merge branch 'master' of https://github.com/roldanjm/Portal2

Conflicts:
	AdministradorSS/build/web/WEB-INF/classes/servletBusqueda/servletNuevaBusqueda.class
	AdministradorSS/build/web/WEB-INF/classes/servletBusqueda/servletRecuperarOfertas.class
	AdministradorSS/build/web/WEB-INF/classes/servletEmpresa/servletEmpresa.class
	AdministradorSS/build/web/WEB-INF/classes/servletLocalidades/servletLocalidadesSelect.class
	AdministradorSS/build/web/WEB-INF/lib/PortalSSDB.jar
	PortalSSDB/build/built-jar.properties
	PortalSSDB/build/classes/bd/Sc_solicitud.class
	PortalSSDB/build/classes/conexion/TransaccionRS.class
	PortalSSDB/build/classes/portalscdb/MainPruebaJM.class
	PortalSSDB/build/classes/transaccion/TPostulante.class
	PortalSSDB/dist/PortalSSDB.jar
	PortalSSDB/src/transaccion/TPostulante.java
	PortalSSWeb/build/web/WEB-INF/classes/servlets/PerfilServlet.class
	PortalSSWeb/build/web/WEB-INF/lib/PortalSSDB.jar
	PortalSSWeb/build/web/detalleoferta.jsp
	PortalSSWeb/build/web/index.jsp
	PortalSSWeb/build/web/ofertas.jsp
	PortalSSWeb/dist/PortalSSWeb.war
	PortalSSWeb/nbproject/project.properties