opinion y detalle pelicula
qa
Merge remote-tracking branch 'origin/master'

Conflicts:
	DAL/bin/Debug/DAL.dll
	Web/Login.aspx.cs
	Web/Usuarios/AdministrarUs.aspx.cs