Fixing...
Fixing 2...
Fixing 3
Fixing 4...
Fixing 5...
Fixing 6...
Fixing 7...
Fix mark_avg bug
Fix timewrap effect
Tiny fix (AsynkTask`s canceling)
Camera update.
Bug fixed
Merge remote-tracking branch 'origin/final' into camera

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