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

Conflicts:
	src/ru/cocsosoft/VoteFragment.java