Merge branch 'master' into iuriy
style for flights
Merge branch 'iuriy'