to com sono
Merge remote-tracking branch 'origin/novaRamificacao' into novaRamificacao

Conflicts:
	src/br/edu/uesb/petshop/control/TelaAddClienteControl.java
	src/br/edu/uesb/petshop/view/BarraDeMenu.java
	src/br/edu/uesb/petshop/view/TelaAddCliente.java
	src/br/edu/uesb/petshop/view/TelaAdicionarNaLista.java