Merge pull request #87 from tuxedio/development

Merge stable into master
fix deprecation issue with itinerary_items ordering
Merge pull request #88 from tuxedio/b-trip-deprecation-issue

fix deprecation issue with itinerary_items ordering
Merge remote-tracking branch 'origin/master' into development