ah...... stupid
Merge branch 'master' of https://github.com/KennyNam/faacebook

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes.dex
	bin/classes/com/yarn/facebook/BasicInfo.class
	bin/classes/com/yarn/facebook/FaceBookBasicInfo.class
	bin/classes/com/yarn/facebook/LoginActivity.class
	bin/classes/com/yarn/facebook/R$id.class
	bin/classes/com/yarn/facebook/R$layout.class
	bin/classes/com/yarn/facebook/R$menu.class
	bin/classes/com/yarn/facebook/R$string.class
	bin/classes/com/yarn/facebook/R$style.class
	bin/classes/com/yarn/facebook/R$styleable.class
	bin/dexedLibs/android-support-v4-926bf8587c5076afc90d6c26500f2ad4.jar
	bin/dexedLibs/facebooksdk-cde609c33462e3e9fdc1f368083b571d.jar
	bin/facebook.apk
	bin/resources.ap_
	gen/com/yarn/facebook/R.java
	project.properties
	src/com/yarn/facebook/FaceBookBasicInfo.java
asf
It can't accept on server, but I don't know why it happens .. :'(
Merge branch 'dev'