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

Conflicts:
	src/main/java/br/com/zoolatria/controller/UsuarioController.java