DEV-19610
DEV-19586
DEV-19594
Merge branch 'master' of https://github.com/Unact/Market

Conflicts:
	app/views/spree/users/show.html.erb