Merge branch 'master' into carga
Cambios
Merge branch 'carga' of https://github.com/UPC-TP3-2014-2/UPC-TP3.git
Tercer caso de uso.. =D
Merge branch 'master' into carga

Conflicts:
	Cliente/UPC.CruzDelSur.Cliente.Carga/Web.config
Merge pull request #37 from UPC-TP3-2014-2/carga

Carga