Alterar e começando a capturar imagem.
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/MyContacts.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/br/com/drummond/lista/dao/ContatoDAO.class
	bin/classes/br/com/mycontacts/Formulario$1.class
	bin/classes/br/com/mycontacts/Formulario.class
	bin/classes/br/com/mycontacts/FormularioHelper.class
	bin/classes/br/com/mycontacts/ListaContatos$1.class
	bin/classes/br/com/mycontacts/ListaContatos$2.class
	bin/classes/br/com/mycontacts/ListaContatos$3.class
	bin/classes/br/com/mycontacts/ListaContatos$4.class
	bin/classes/br/com/mycontacts/ListaContatos.class
	bin/classes/br/com/mycontacts/R$id.class
	bin/dexedLibs/appcompat_v7-cc9be39ed994890b1d9bef53ce034cda.jar
	bin/resources.ap_
	gen/br/com/mycontacts/R.java
	src/br/com/drummond/lista/dao/ContatoDAO.java
	src/br/com/mycontacts/Formulario.java
	src/br/com/mycontacts/FormularioHelper.java
	src/br/com/mycontacts/ListaContatos.java