Change-Id: I3298d040b936d5e0dff97500b86b911d64f99ce2
Signed-off-by: Igor Polovykh <Igor.Polovykh@gmail.com>
Merge branch 'master' of git@github.com:cocsosoft/ThatBetter.git

Conflicts:
	res/layout/fragment_preview_all.xml
	res/layout/fragment_preview_one.xml
	src/ru/cocsosoft/CameraFragment.java
	src/ru/cocsosoft/ThatBetterActivity.java
Merge branch 'master' of git@github.com:cocsosoft/ThatBetter.git

Conflicts:
	src/ru/cocsosoft/CocsFragment.java
	src/ru/cocsosoft/ImagePreview.java
Change-Id: I0e4a37d01cdbff047d2c4ac663bf33c0aeaefc62