Agregando segunda iteracion
Merge remote-tracking branch 'origin/master' into marco-rodriguez

Conflicts:
	BECA2/UI/App.config