Merge branch 'soon' into staging

bower.json

@@ -41,7 +41,7 @@
     "diff-dom": "2.1.1",
     "nthen": "0.1.7",
     "open-sans-fontface": "^1.4.2",
-    "bootstrap-tokenfield": "^0.12.1",
+    "bootstrap-tokenfield": "0.12.1",
     "localforage": "^1.5.2",
     "html2canvas": "^0.4.1",
     "croppie": "^2.5.0",

www/common/outer/cache-store.js

@@ -2,7 +2,7 @@ define([
     '/common/common-util.js',
     '/bower_components/localforage/dist/localforage.min.js',
 ], function (Util, localForage) {
-    var S = {};
+    var S = window.CryptPad_Cache = {};
     var onReady = Util.mkEvent(true);
 
     // Check if indexedDB is allowed

www/common/outer/sharedfolder.js

@@ -249,6 +249,7 @@ define([
                                 if (obj.store.handleSharedFolder) {
                                     obj.store.handleSharedFolder(obj.id, null);
                                 }
+                                obj.cb();
                             });
                         } catch (e) {}
                         delete allSharedFolders[secret.channel];
@@ -260,6 +261,7 @@ define([
                     if (info.error === "ERESTRICTED" ) {
                         sf.teams.forEach(function (obj) {
                             obj.store.manager.restrictedProxy(obj.id, secret.channel);
+                            obj.cb();
                         });
                         delete allSharedFolders[secret.channel];
                         return void cb();