Resolved differences merging 2.5.x into saas

airtime_mvc/public/js/airtime/library/plupload.js

@@ -23,7 +23,10 @@ $(document).ready(function() {
 		multiple_queues : 'true',
 		filters : [
 			{title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4,opus"}
-		]
+		],
+                multipart_params : {
+                    "csrf_token" : $("#csrf").attr('value'),
+                }
 	});
 
 	uploader = $("#plupload_files").pluploadQueue();

airtime_mvc/public/js/airtime/schedule/add-show.js

@@ -354,6 +354,8 @@ function setAddShowEvents(form) {
             startTimeField.val(json.start.time);
             endDateField.val(json.end.date);
             endTimeField.val(json.end.time);
+            // Change the timezone now that we've updated the times
+            currentTimezone = newTimezone;
         });
     });