Merge branch 'offering_demo' of D:\IF-048Java\SoftTour with conflicts.
Commit Message