DEV-19864
Merge branch 'master' of https://github.com/Unact/Market

Conflicts:
	app/models/market/partner.rb
DEV-19864
Merge branch 'master' of https://github.com/Unact/Market