Merge booking develop in main develop

We need to check which templates referencing booking still need to be migrated. Once they have been moved we can make these templates more Bluebottle / generic.