Merge branch 'develop' into feature/django2

rowers/views/paymentviews.py

@@ -522,9 +522,11 @@ def rower_register_view(request):
                                                       title='New User Sample Data',
                                                       notes='This is an example workout to get you started')
             newworkoutid = response[0]
-            w = Workout.objects.get(id=newworkoutid)
-            w.startdatetime = timezone.now()
-            w.save()
+            if newworkoutid:
+                w = Workout.objects.get(id=newworkoutid)
+                w.startdatetime = timezone.now()
+                w.date = timezone.now().date()
+                w.save()
             
             # Create and send email
             fullemail = first_name + " " + last_name + " " + "<" + email + ">"