made payment more generic
Merge branch 'feature/BOOK-672-PAYMENT' of github.com:onepercentclub/bluebottle into feature/BOOK-672-PAYMENT
BOOK-672, fixes
Merge branch 'feature/BOOK-672-PAYMENT' of github.com:onepercentclub/bluebottle into feature/BOOK-672-PAYMENT
Merge pull request #865 from onepercentclub/feature/BOOK-672-PAYMENT

Feature/book 672 payment