ContactListActivity
Merge branch 'master' of https://github.com/ssshi/StudyJam

Conflicts:
	AnyWall-android/.idea/misc.xml
	AnyWall-android/.idea/workspace.xml
	AnyWall-android/out/production/Anywall/Anywall.apk

AnyWall-android/out/production/Anywall/com/parse/anywall/MainActivity$2.
class

AnyWall-android/out/production/Anywall/com/parse/anywall/PostActivity.cl
ass
	AnyWall-android/out/production/Anywall/com/parse/anywall/R$layout.class
	AnyWall-android/out/production/Anywall/com/parse/anywall/R$menu.class
	AnyWall-android/out/production/Anywall/com/parse/anywall/R$string.class
	AnyWall-android/out/production/Anywall/com/parse/anywall/R$style.class

AnyWall-android/out/production/Anywall/com/parse/anywall/R$styleable.cla
ss
	AnyWall-android/out/production/Anywall/com/parse/anywall/R.class

AnyWall-android/out/production/Anywall/com/parse/anywall/SettingsActivit
y.class

AnyWall-android/out/production/Anywall/com/parse/anywall/SignUpActivity$
1.class

AnyWall-android/out/production/Anywall/com/parse/anywall/SignUpActivity$
2.class

AnyWall-android/out/production/Anywall/com/parse/anywall/SignUpActivity$
3.class

AnyWall-android/out/production/Anywall/com/parse/anywall/SignUpActivity.
class

AnyWall-android/out/production/Anywall/com/parse/anywall/WelcomeActivity
.class