Merged upstream master into task/3772/hosting_billing_monthly_subscription

hosting/urls.py

@@ -1,6 +1,5 @@
 from django.conf.urls import url
 from django.contrib.auth import views as auth_views
-
 from .views import (
     DjangoHostingView, RailsHostingView, PaymentVMView, NodeJSHostingView,
     LoginView, SignupView, SignupValidateView, SignupValidatedView, IndexView,
@@ -9,7 +8,9 @@ from .views import (
     MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView,
     HostingPricingView, CreateVirtualMachinesView, HostingBillListView,
     HostingBillDetailView, SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView,
-    SSHKeyChoiceView, DashboardView)
+    SSHKeyChoiceView, DashboardView, SettingsView)
+
+
 
 urlpatterns = [
     url(r'index/?$', IndexView.as_view(), name='index'),
@@ -19,6 +20,7 @@ urlpatterns = [
     url(r'rails/?$', RailsHostingView.as_view(), name='railshosting'),
     url(r'pricing/?$', HostingPricingView.as_view(), name='pricing'),
     url(r'payment/?$', PaymentVMView.as_view(), name='payment'),
+    url(r'settings/?$', SettingsView.as_view(), name='settings'),
     url(r'orders/?$', OrdersHostingListView.as_view(), name='orders'),
     url(r'order-confirmation/?$', OrdersHostingDetailView.as_view(),
         name='order-confirmation'),