Merge branch 'master' of
https://github.com/leonardocostaborges/zoolatria.git

Conflicts:
	src/main/webapp/WEB-INF/views/clinic.jsp
Início tela de banho e tosa.
persistence
Rebase persistence
Revert "Início tela de banho e tosa."

This reverts commit f6445f752526ffbca52dc413c9cb6c597da1c911.
Revert "Revert "Início tela de banho e tosa.""

This reverts commit c3d350a257657e5ef35ed107f4718a522091548f.
Revert "Rebase persistence"

This reverts commit 2842eb03e4c2932a1cc29a390f911f350097d80a.
Merge branch 'master' of
https://github.com/leonardocostaborges/zoolatria.git