Desarrollo
ingnore
Merge branch 'master' of https://github.com/sclMAX/Indumatics_PlantaPintura

Conflicts:
	.gitignore
	nbproject/private/private.xml