adding canceled scope and canceled? boolean

Conflicts:
	app/models/spree/subscription.rb