clearing bugs
Merge branch 'master' of https://github.com/Unact/Market

Conflicts:
	app/models/market/user_address.rb
	app/models/spree/user_decorator.rb