Merge branch 'master' of https://github.com/cosejo/SGAG

Conflicts:
	ITCR.SGAG/ITCR.SGAG.Interfaz/frmGestionInventario.aspx.designer.cs

Adelantos Inventario
Merge branch 'master' of https://github.com/cosejo/SGAG

Conflicts:
	ITCR.SGAG/ITCR.SGAG.Interfaz/frmGestionInventario.aspx.designer.cs