Merge branch 'staging' into chat

www/drive/main.js

@@ -41,7 +41,7 @@ define([
             var secret = Utils.Hash.getSecrets('drive', hash);
             if (hash) {
                 // Add a shared folder!
-                // XXX password?
+                // TODO password?
                 Cryptpad.addSharedFolder(secret, function (id) {
                     window.CryptPad_newSharedFolder = id;
                     // Update the hash in the address bar

www/settings/inner.js

@@ -236,9 +236,9 @@ define([
                                     label: { class: 'noTitle' }
                                 });
         var $div2 = $(h('div.cp-settings-autostore-radio', [
-            opt1,
+            opt3,
             opt2,
-            opt3
+            opt1
         ])).appendTo($div);
 
         $div.find('input[type="radio"]').on('change', function () {