rty
Merge branch 'hotfixes_master_teste' into develop

Conflicts:
	index.html
tey
ygujfju
Merge branch 'hotfixes_5' into develop

Conflicts:
	index.html
dfg
rty
Update index.html
Merge pull request #1 from rbraga/develop

Versão 2.0