Complete pair upload
Merge branch 'master' of github.com:bopang/FaceMe
Modify UI in Android
Merge branch 'master' of github.com:bopang/FaceMe

Conflicts:
	FaceMe_Android/res/layout/activity_main.xml
	FaceMe_Android/src/com/example/faceme_android/MainActivity.java