Merge branch 'develop' into feature/sensorfusion

rowers/views.py

@@ -5070,10 +5070,14 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 	nrintervals = len(idist)
 	row.summary = intervalstats
 	#intervalstats = rowdata.allstats()
-        if s:
-	    row.notes += u'{n} \n {s}'.format(
-                n = row.notes,
-                s = s
+        if s:
+            try:
+	        row.notes += u'{n} \n {s}'.format(
+                    n = row.notes,
+                    s = s
+                )
+            except TypeError:
+                pass
             
 	row.save()
 	rowdata.write_csv(f1,gzip=True)