DEV-21206 part 3
Merge branch 'master' of https://github.com/Unact/Market

Conflicts:
	app/models/market/payment.rb
fix status
fix status
DEV-21206 fixtures
info presence bug fix
DEV-21239
Merge branch 'master' of https://github.com/Unact/Market

Conflicts:
	db/schema.rb
	test/fixtures/market/account_types.yml
	test/fixtures/market/accounts.yml
	test/fixtures/market/payment_types.yml
	test/fixtures/market/payments.yml
	test/fixtures/spree/orders.yml
DEV-21204
DEV-21239
Merge branch 'master' into releases