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

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/Player1Offense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense.class
	FaceOff/bin/resources.ap_