Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2/UI/My Project/Resources.resx
	BECA2/UI/UI.vbproj
Merge branch 'master' of https://github.com/KOIP2/AplicacionBeca2-KOI

Conflicts:
	BECA2/UI/My Project/Resources.resx
	BECA2/UI/UI.vbproj
Reparando
Merge branch 'master' of https://github.com/KOIP2/AplicacionBeca2-KOI

Conflicts:
	BECA2/UI/My Project/Resources.resx
	BECA2/UI/UI.vbproj
Modificacion DAL
Reparando
Reparacion final
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/UI/UI.vbproj
Reparando de nuevo
Arreglando DAL