DEV-19762
DEV-19545 part 5
renaming tables
renaming tables
Merge branch 'master' of https://github.com/Unact/Market
DEV-19545 part 6
clearing bugs
Merge branch 'master' of https://github.com/Unact/Market

Conflicts:
	app/models/market/user_address.rb
	app/models/spree/user_decorator.rb
Merge branch 'master' into releases