misc
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ru/altimin/hat/activities/GameActivity.java