change
Merge branch 'master' of github.com:yggc/sc

Conflicts:
	app/controllers/orders_controller.rb