Merge branch 'master' into production

app/locale/en.coffee

@@ -747,6 +747,7 @@
     password_tab: "Password"
     emails_tab: "Emails"
     admin: "Admin"
+    manage_subscription: "Click here to manage your subscription."
     new_password: "New Password"
     new_password_verify: "Verify"
     type_in_email: "Type in your email to confirm account deletion."

app/templates/account/account-settings-view.jade

@@ -26,6 +26,15 @@ else
               .form-group.checkbox
                 label(for="godmode", data-i18n="account_settings.god_mode") God Mode
                 input#godmode(name="godmode", type="checkbox", checked=godmode)
+            if me.hasSubscription()
+              .form-group
+                label(data-i18n="account.subscription")
+                br
+                span.spr ✓
+                span(data-i18n="account.active")
+                span.spr= '.'
+                // TODO: show better summary states, like active, subscribed, free, and active until.
+                a(href="/account/subscription", data-i18n="account_settings.manage_subscription")
                 
     
       .panel.panel-default

app/views/courses/TeacherCoursesView.coffee

@@ -162,7 +162,7 @@ module.exports = class TeacherCoursesView extends RootView
 
     user = @usersToRedeem.first()
 
-    prepaid = @prepaids.find((prepaid) -> prepaid.get('properties').endDate? and prepaid.openSpots())
+    prepaid = @prepaids.find((prepaid) -> prepaid.get('properties')?.endDate? and prepaid.openSpots())
     prepaid = @prepaids.find((prepaid) -> prepaid.openSpots()) unless prepaid
     $.ajax({
       method: 'POST'