Fix mostrar edicao de temas.
Conflito no .project.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.project