Operacion Sistema 7

Scripts
Merge remote-tracking branch 'origin/master'

Conflicts:
	Solucionc#Sfdas/MainSite/Datos/DataContent.dbml.layout