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
DEV-19864
DEV-19864 recover user form
DEV-19864
DEV-19977
Merge branch 'master' into releases