Display image in player2defense

still need to implement camera in player1 offense which then takes a
picture. then the name of that picture needs to go in place of test.jpg
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex