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

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/resources.ap_