Merge pull request #816 from onepercentclub/booking/development

Merge booking develop in main develop
Merge pull request #844 from onepercentclub/develop

Merge pull request #816 from onepercentclub/booking/development