Pre-work
Merge remote-tracking branch 'origin/camera' into final
Merge remote-tracking branch 'origin/camera' into final
PhotoTaker UI
Fixed some important filters` bugs
Fix fragment`s retain problem
Merge remote-tracking branch 'origin/final' into camera

Conflicts:
	.idea/workspace.xml
	AndroidManifest.xml
	out/production/PhotoStream/PhotoStream.apk
	out/production/PhotoStream/PhotoStream.unaligned.apk
	out/production/PhotoStream/ru/example/PhotoStream/R$string.class
	out/production/PhotoStream/ru/example/PhotoStream/R.class
	src/ru/example/PhotoStream/Activities/PhotoTakerActivity.java
Merged.