Facebook login
Merge branch 'iamsoupy-master' into develop

Conflicts:
	AndroidManifest.xml
	project.properties
	src/tw/org/android/conference/MainActivity.java