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

Conflicts:
	BECA2/DAL/app.config
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Merge branch 'Wen' of https://github.com/KOIP2/AplicacionBeca2-KOI into Wen

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