BOOK-672, fixes
Merge branch 'feature/BOOK-672-PAYMENT' of github.com:onepercentclub/bluebottle into feature/BOOK-672-PAYMENT