Merge origin/master

Conflicts:
	app/View/conteudos/ArquivoMView.php
Merge origin/master
Adicionei página MidiaListaView.php
Merge origin/master