Merge Faculdade - trabalho
Merge remote-tracking branch 'origin/BrunoBranch' into BrunoBranch

Conflicts:
	ProjetoVendas/src/META-INF/persistence.xml