Merge changes from remote

Gemfile.lock

@@ -102,7 +102,7 @@ GEM
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     pg (0.17.1)
-    phantomjs (1.9.7.0)
+    phantomjs (1.9.7.1)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)

models/site.rb

@@ -559,7 +559,7 @@ class Site < Sequel::Model
 
     uploaded_size = uploaded.size
 
-    FileUtils.mv uploaded.path, path
+    FileUtils.cp uploaded.path, path
     File.chmod 0640, path
 
     site_file ||= SiteFile.new site_id: self.id, path: relative_path

views/site_files/text_editor.erb

@@ -113,7 +113,7 @@
     if(unsavedChanges == false)
       return
     $.ajax({
-      url: '/site_files/save/<%= @filename %>?csrf_token=<%= csrf_token %>',
+      url: '/site_files/save/<%= Rack::Utils.escape @filename %>?csrf_token=<%= Rack::Utils.escape csrf_token %>',
       data: editor.getValue(),
       processData: false,
       contentType: false,
@@ -185,4 +185,4 @@
     return true
   })
 
-</script>
+</script>

workers/screenshot_worker.rb

@@ -50,7 +50,8 @@ class ScreenshotWorker
       # :nocov:
       puts "#{username}/#{path} is timing out, discontinuing"
       site = Site[username: username]
-      site.update is_crashing: true
+      site.is_crashing = true
+      site.save_changes validate: false
       
       # Don't enable until we know it works well.
 =begin
@@ -102,4 +103,4 @@ class ScreenshotWorker
       }
     end
   end
-end
+end