não master
Merge branch 'master' into develop

Conflicts:
	404.html
ert
somente develop
Merge branch 'develop'

Conflicts:
	index.html