Changes to product scope to fixe new products page
Merge branch '0-11-stable' of https://github.com/preston-scott/spree into preston-scott-0-11-stable

Conflicts:
	lib/scopes/product.rb