eee
Merge branch 'develop'

Conflicts:
	index.html
frty
sdrt
tyu
Merge branch 'hotfixes_master_teste' into develop

Conflicts:
	index.html