from Jose
Merge branch 'master' of https://github.com/MKrakhin/sberhackathon

Conflicts:
	Sberbank.xcodeproj/project.pbxproj
wip
WIP
Merge branch 'master' of https://github.com/MKrakhin/sberhackathon

Conflicts:
	Sberbank.xcodeproj/project.pbxproj.orig
Merge branch 'master' of https://github.com/MKrakhin/sberhackathon

Conflicts:
	Sberbank.xcodeproj/project.pbxproj
Merged our work