lel

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

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/UI.vbproj