Commit de respaldo
Merge branch 'dev' of https://github.com/mixitProyecto/mixit into dev

Conflicts:
	prototipo3/uy.edu.ort.Mixit.Front/uy.edu.ort.Mixit.Front/Controllers/FileController.cs
	prototipo3/uy.edu.ort.Mixit.Front/uy.edu.ort.Mixit.Front/uy.edu.ort.Mixit.Front.csproj