Merge remote-tracking branch 'origin/feature/book-713-dodata-payment-adapter' into feature/book-745
merged changes for book-713
Merge remote-tracking branch 'origin/feature/book-713-dodata-payment-adapter' into feature/book-745
add fundraiser to donations api
- update ember to use OrderPayment rather than Payment not match API
- fix error reloading order before transitioning to PSP
- correctly load project or fundraiser when returing from PSP
add test for fundraiser donation and make fundraiser field not required for donation BOOK-745
Merge remote-tracking branch 'upstream/feature/book-745' into feature/book-713-dodata-payment-adapter

Conflicts:
	bluebottle/bb_donations/serializers.py
	bluebottle/bb_donations/tests/test_api.py
	bluebottle/payments/views.py
Change how payment settings are specified