123
Merge branch 'master' of https://github.com/ryancho/ryancho

Conflicts:
	com.jaedongchicken.socialdining/bin/R.txt
	com.jaedongchicken.socialdining/bin/classes/com/facebook/android/R$color.class
	com.jaedongchicken.socialdining/bin/classes/com/facebook/android/R$dimen.class
	com.jaedongchicken.socialdining/bin/classes/com/facebook/android/R$drawable.class
	com.jaedongchicken.socialdining/bin/classes/com/facebook/android/R$id.class
	com.jaedongchicken.socialdining/bin/classes/com/facebook/android/R$layout.class
	com.jaedongchicken.socialdining/bin/classes/com/facebook/android/R$string.class
	com.jaedongchicken.socialdining/bin/classes/com/facebook/android/R$style.class
	com.jaedongchicken.socialdining/bin/classes/com/facebook/android/R$styleable.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/LoginActivity$5.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/LoginActivity.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/R$color.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/R$dimen.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/R$drawable.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/R$id.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/R$layout.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/R$string.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/R$style.class
	com.jaedongchicken.socialdining/bin/classes/com/jaedongchicken/socialdining/R$styleable.class
	com.jaedongchicken.socialdining/gen/com/facebook/android/R.java
	com.jaedongchicken.socialdining/gen/com/jaedongchicken/socialdining/R.java
	com.jaedongchicken.socialdining/project.properties