Final
UID
Merge remote-tracking branch 'origin/final' into camera

Conflicts:
	.idea/workspace.xml
	out/production/PhotoStream/PhotoStream.apk
	out/production/PhotoStream/PhotoStream.unaligned.apk
	res/values/strings.xml