merge conflicts
Merge branch 'master' of https://github.com/mixitProyecto/mixit

Conflicts:
	DATOS/streams/039C0964-FF2F-B30A-A09B-0E81EF1E1383.flv
	red5recorder/src/assets/._stop_rec.png