Merge branch 'dev'

ajax/backend/settings/cancelSubscription.php

ajax/backend/settings/deleteBillingPlan.php

ajax/backend/settings/getBillingPlans.php

ajax/backend/settings/getSubscription.php

ajax/backend/settings/getSubscriptions.php

ajax/createSubscription.php

bin/classes/Stripe.js

bin/controls/PaymentDisplay.js

bin/controls/Recurring/PaymentDisplay.js

bin/controls/backend/Offers.css

bin/controls/backend/SubscriptionWindow.css

bin/controls/backend/SubscriptionWindow.js

bin/controls/backend/settings/BillingPlans.css

bin/controls/backend/settings/BillingPlans.js

bin/controls/backend/settings/Subscriptions.css

bin/controls/backend/settings/Subscriptions.js

database.xml

locale.xml

permissions.xml

settings.xml