Eliminando nbproject para que no joda mas.
Creo que no dara mas problemas.
Merge branch 'master' of github.com:dmallcott/SIGULAB-CompraImportacion

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml