intento arreglar
Merge remote-tracking branch 'origin/paula'

Conflicts:
	BECA2/UI/My Project/Resources.Designer.vb
	BECA2/UI/UI.vbproj