fix
load.rb end
del load.rb
Merge branch 'master' of github.com:babrovka/testmarket

Conflicts:
	app/controllers/spree/admin/pricelist_controller.rb
	config/routes.rb
price loader ui
struggling roo
Merge pull request #2 from pirj/master

Загрузка прайса