Erros
Merge branch 'master' of https://github.com/NEAT-TI/SIGE

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties