Commit
Merge branch 'develop' of https://github.com/diegospotti/teste into develop

Conflicts:
	default.html
Commit Juridico
Commit
Commit Juridico
develop
Merge branch 'juridico' into develop

Conflicts:
	default.html
Commit Develop
Commit Jur02
Commit 2
Merge branch 'develop' into Jur02
commit Develop
Merge branch 'Jur02' into develop