modify
Merge branch 'master' of https://github.com/songgz/wizshop

Conflicts:
	app/models/shipping_rate.rb
	app/views/admin/shipping_zones/_form.html.erb
	lib/tasks/delivery.rake
modify