Reparando

Merge remote-tracking branch 'origin/Wen' into
Wen

Conflicts:
	BECA2/DAL/app.config
	BECA2/UI/My
Project/Application.Designer.vb
	BECA2/UI/My
Project/Application.myapp
	BECA2/UI/UI.vbproj