Fix Configuration options link
Merge pull request #53 from devknoll/patch-1

Fix Configuration options link
Add setup fees for subscriptions
Merge pull request #54 from devknoll/setup-fees

Add setup fees for subscriptions
Merge remote-tracking branch 'origin/master' into invert-subscription-flow

Conflicts:
	app/services/payola/create_subscription.rb