Merge pull request #816 from onepercentclub/booking/development

Merge booking develop in main develop