primer commit
arreglando el gemfile
Merge branch 'master' of https://github.com/openjaf/spree_location

Conflicts:
	Gemfile
	app/helpers/spree/admin/products_helper_decorator.rb
	app/models/spree/location.rb
	app/views/spree/admin/products/_location.html.erb
	spree_location.gemspec