Merge remote-tracking branch 'origin/master'

Conflicts:
	Trabalho_ISS_PetShop/src/br/com/uem/iss/petshop/Main/view/MainView.form
	Trabalho_ISS_PetShop/src/br/com/uem/iss/petshop/Main/view/MainView.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trabalho_ISS_PetShop/src/META-INF/persistence.xml
	Trabalho_ISS_PetShop/src/br/com/uem/iss/petshop/Main/view/MainView.form
	Trabalho_ISS_PetShop/src/br/com/uem/iss/petshop/Main/view/MainView.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 97a12bdd00194faf3320a6381367bac167ea7d98.