cambios frmalmacen
Merge branch 'master' of https://github.com/tkMageztik/SICWEB_INDUMET

Conflicts:
	SICSoftware/SICSoftware/SICSoftware.suo