nao sei
Merge branch 'origin/dev'

Conflicts:
	projetoTestaRepositorio/WebContent/home.html