Merge
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/AndroidManifest.xml
	FaceOff/bin/AndroidManifest.xml
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/FaceCompare.class
	FaceOff/bin/classes/com/example/faceoff/FaceCompare2.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense.class
	FaceOff/bin/classes/com/example/faceoff/R$id.class
	FaceOff/bin/classes/com/example/faceoff/R$layout.class
	FaceOff/bin/classes/com/example/faceoff/R$menu.class
	FaceOff/bin/classes/com/example/faceoff/R$string.class
	FaceOff/bin/classes/com/example/faceoff/R$style.class
	FaceOff/bin/classes/com/example/faceoff/SinglePhone$2.class
	FaceOff/bin/classes/com/example/faceoff/SinglePhone$3.class
	FaceOff/bin/classes/com/example/faceoff/SinglePhone.class
	FaceOff/bin/classes/com/example/faceoff/StartFaceOff.class
	FaceOff/bin/resources.ap_
	FaceOff/gen/com/example/faceoff/R.java
	FaceOff/res/layout/activity_single_phone.xml
	FaceOff/src/com/example/faceoff/Player1Defense.java
	FaceOff/src/com/example/faceoff/Player2Defense.java
	FaceOff/src/com/example/faceoff/SinglePhone.java