Terminada o layout pagina midia
Merge origin/master

Conflicts:
	midias.php