Merge booking develop in main develop

We should add the Redirect App from 1%Club so Booking can define the /go urls. Then we can revert some of these changes.