1
Merge branch 'master' of https://github.com/alzhuravlev/vagon-common

Conflicts:
	.project
	jni/vg/screens/game_screen.h