Teste 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/br/com/appvendas/TelaPrincipalActivity.java