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

Conflicts:
	.project