1
Merge branch 'master' of https://github.com/cocsosoft/ThatBetter.git

Conflicts:
	src/ru/cocsosoft/CameraFragment.java