.
Merge branch 'master' of
git@github.com:jpfaria/caelum-fj-31-loja-client.git

Conflicts:
	appClientModule/br/com/caelum/loja/client/exemplo/ClienteGerenciador.java