Merge branch 'lookitstony/master'

Conflicts:
	src/Stripe/Entities/StripeCharge.cs
	src/Stripe/Entities/StripeCustomer.cs
	src/Stripe/Entities/StripeInvoiceItem.cs
	src/Stripe/Entities/StripePlan.cs
	src/Stripe/Entities/StripeRecipient.cs
	src/Stripe/Entities/StripeSubscriptionList.cs
	src/Stripe/Entities/StripeTransfer.cs
	src/Stripe/Infrastructure/ParameterBuilder.cs
	src/Stripe/Infrastructure/Urls.cs
	src/Stripe/Services/Charges/StripeChargeCreateOptions.cs
	src/Stripe/Services/Customers/StripeCustomerCreateOptions.cs
	src/Stripe/Services/Customers/StripeCustomerUpdateOptions.cs
	src/Stripe/Services/InvoiceItems/StripeInvoiceItemCreateOptions.cs
	src/Stripe/Services/InvoiceItems/StripeInvoiceItemUpdateOptions.cs
	src/Stripe/Services/Plans/StripePlanCreateOptions.cs
	src/Stripe/Services/Plans/StripePlanUpdateOptions.cs
	src/Stripe/Services/Recipients/StripeRecipientCreateOptions.cs
	src/Stripe/Services/Recipients/StripeRecipientUpdateOptions.cs
	src/Stripe/Services/Transfers/StripeTransferCreateOptions.cs
	src/Stripe/Stripe.csproj