Fixed crash when handling free subscriptions without a payment method.

Fixed Deface override error that caused a crash.
Fix admin page crash when there are subscribable items in someone's cart.
Merge branch '2-0-beta' into 2-0-custom

Conflicts:
	app/models/spree/subscription.rb
	spree_subscribe.gemspec
Removed extra association.