Change-Id: Ice80d532f55fd513109914d834c3cc723cb60c94
Merge branch 'master' of ssh://git@github.com/cocsosoft/ThatBetter.git

Conflicts:
	res/layout/fragment_preview_all.xml
	res/layout/fragment_preview_one.xml
	src/ru/cocsosoft/CocsFragment.java
	src/ru/cocsosoft/ImagePreview.java