some modifications
fixc onflict
Merge branch 'master' of https://github.com/DmitryDrozdik/yalta-android-app
add screen number 7