Mantenimiento de test
Merge branch 'master' of https://github.com/normandanielmq/ProyectoTest

Conflicts:
	Cliente/appTestCliente/appTestCliente/Views/MisQuices/MostrarPortada.cshtml
	ServicioWeb/appTest/log/development.log