add spec to order uncanceller
Merge branch 'master' into upgrades

Conflicts:
	spec/factories/products.rb