Merge branch 'airlines_feedback_changes' into 'develop'

Comments on some "unclear" parts of the code

See merge request !86