Merge pull request #1006 from onepercentclub/feature/book-donations-merge

Merge booking master into donations
Merge pull request #1008 from onepercentclub/feature/fund-loving-criminals

Merge booking master into donations