Nada en especial
Merge branch 'master' of https://github.com/amerikillo/InventariosChiapas

Conflicts:
	InventariosChiapas/nbproject/private/private.xml
aa