CLUB-677 fixes
Merge branch 'feature/CLUB-677' of github.com:onepercentclub/bluebottle into feature/CLUB-677

Conflicts:
	bluebottle/payments_mock/views.py