adding canceled scope and canceled? boolean
adding canceled scope and canceled? boolean

Conflicts:
	app/models/spree/subscription.rb

mcsweeneys/solidus_subscriptions,nebulab/spree-subscriptions,mcsweeneys/solidus_subscriptions,nebulab/spree-subscriptions,mcsweeneys/solidus_subscriptions,nebulab/spree-subscriptions