teste
teste
Merge branch 'master' of github.com:alexmmota/iconnect

Conflicts:
	.classpath
	.project
	bin/classes/br/com/Dialog/DialogTwitter.class
	bin/classes/br/com/socialcoreo/Cadastro.class
	bin/classes/br/com/socialcoreo/FacebookAuth.class
	bin/classes/br/com/socialcoreo/Login$1.class
	bin/classes/br/com/socialcoreo/Login$2.class
	bin/classes/br/com/socialcoreo/Login.class
	bin/classes/br/com/socialcoreo/Main$1.class
	bin/classes/br/com/socialcoreo/Main$2.class
	bin/classes/br/com/socialcoreo/Main$3.class
	bin/classes/br/com/socialcoreo/Main$4.class
	bin/classes/br/com/socialcoreo/Main$5.class
	bin/classes/br/com/socialcoreo/Main.class
	bin/classes/br/com/socialcoreo/R$drawable.class
	bin/classes/br/com/socialcoreo/R$id.class
	bin/classes/br/com/socialcoreo/R$layout.class
	bin/classes/br/com/socialcoreo/R$string.class
	bin/classes/br/com/socialcoreo/R$style.class
	bin/classes/br/com/socialcoreo/R$styleable.class
	bin/classes/br/com/socialcoreo/R.class
	bin/classes/com/facebook/android/R$drawable.class
	libs/android-support-v4.jar
	project.properties
Merge branch 'master' of github.com:alexmmota/iconnect