fix de commit
Merge origin/master

Conflicts:
	src/br/com/rodrigoviniciusronaldo/Contato.java
	src/br/com/rodrigoviniciusronaldo/ContatosNaNuvem.java