ok
ok
Merge branch 'master' of ssh://git@github.com/cocsosoft/ThatBetter.git

Conflicts:
	AndroidManifest.xml
	src/ru/cocsosoft/Installation.java