Merge branch 'master' into boss_ginger
new logic about flights
Merge branch 'boss_ginger'