scrivito_sdk 0.18.1 → 0.30.0.rc1

data/config/cms_routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  get '/' => 'scrivito/cms_dispatch#index', as: 'cms_root'
+  get '/' => 'scrivito/cms_dispatch#index', as: :scrivito_root
 
   get '__scrivito/render_widget/:id/show_widget/:widget_id' => 'scrivito/cms_dispatch#show_widget'
   get '__scrivito/render_widget/:id/widget_details/:widget_id' => 'scrivito/cms_dispatch#widget_details'
@@ -14,7 +14,7 @@ Rails.application.routes.draw do
 
   match '/*permalink',
     to: 'scrivito/cms_dispatch#index',
-    as: 'cms_permalink',
+    as: :scrivito_permalink,
     format: false,
     via: :all
 end

data/config/routes.rb

@@ -9,6 +9,8 @@ Rails.application.routes.draw do
     member do
       get :details
       get :widget_class_selection
+      get :modification
+      get :widget_modification
 
       post :copy
       post :duplicate
@@ -17,6 +19,7 @@ Rails.application.routes.draw do
       put :restore
       put :mark_resolved
       put :destroy_widget
+      put :revert_widget
     end
   end
 

data/lib/assets/javascripts/{scrivito_editing.js → scrivito_sdk.js}

@@ -5403,7 +5403,7 @@ if (typeof module !== 'undefined' && module.exports) {
 }
 
 ;
-//     Underscore.js 1.6.0
+//     Underscore.js 1.7.0
 //     http://underscorejs.org
 //     (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
@@ -5419,9 +5419,6 @@ if (typeof module !== 'undefined' && module.exports) {
   // Save the previous value of the `_` variable.
   var previousUnderscore = root._;
 
-  // Establish the object that gets returned to break out of a loop iteration.
-  var breaker = {};
-
   // Save bytes in the minified (but not gzipped) version:
   var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
 
@@ -5436,15 +5433,6 @@ if (typeof module !== 'undefined' && module.exports) {
   // All **ECMAScript 5** native function implementations that we hope to use
   // are declared here.
   var
-    nativeForEach      = ArrayProto.forEach,
-    nativeMap          = ArrayProto.map,
-    nativeReduce       = ArrayProto.reduce,
-    nativeReduceRight  = ArrayProto.reduceRight,
-    nativeFilter       = ArrayProto.filter,
-    nativeEvery        = ArrayProto.every,
-    nativeSome         = ArrayProto.some,
-    nativeIndexOf      = ArrayProto.indexOf,
-    nativeLastIndexOf  = ArrayProto.lastIndexOf,
     nativeIsArray      = Array.isArray,
     nativeKeys         = Object.keys,
     nativeBind         = FuncProto.bind;
@@ -5458,8 +5446,7 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Export the Underscore object for **Node.js**, with
   // backwards-compatibility for the old `require()` API. If we're in
-  // the browser, add `_` as a global object via a string identifier,
-  // for Closure Compiler "advanced" mode.
+  // the browser, add `_` as a global object.
   if (typeof exports !== 'undefined') {
     if (typeof module !== 'undefined' && module.exports) {
       exports = module.exports = _;
@@ -5470,98 +5457,125 @@ if (typeof module !== 'undefined' && module.exports) {
   }
 
   // Current version.
-  _.VERSION = '1.6.0';
+  _.VERSION = '1.7.0';
+
+  // Internal function that returns an efficient (for current engines) version
+  // of the passed-in callback, to be repeatedly applied in other Underscore
+  // functions.
+  var createCallback = function(func, context, argCount) {
+    if (context === void 0) return func;
+    switch (argCount == null ? 3 : argCount) {
+      case 1: return function(value) {
+        return func.call(context, value);
+      };
+      case 2: return function(value, other) {
+        return func.call(context, value, other);
+      };
+      case 3: return function(value, index, collection) {
+        return func.call(context, value, index, collection);
+      };
+      case 4: return function(accumulator, value, index, collection) {
+        return func.call(context, accumulator, value, index, collection);
+      };
+    }
+    return function() {
+      return func.apply(context, arguments);
+    };
+  };
+
+  // A mostly-internal function to generate callbacks that can be applied
+  // to each element in a collection, returning the desired result — either
+  // identity, an arbitrary callback, a property matcher, or a property accessor.
+  _.iteratee = function(value, context, argCount) {
+    if (value == null) return _.identity;
+    if (_.isFunction(value)) return createCallback(value, context, argCount);
+    if (_.isObject(value)) return _.matches(value);
+    return _.property(value);
+  };
 
   // Collection Functions
   // --------------------
 
   // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles objects with the built-in `forEach`, arrays, and raw objects.
-  // Delegates to **ECMAScript 5**'s native `forEach` if available.
-  var each = _.each = _.forEach = function(obj, iterator, context) {
+  // Handles raw objects in addition to array-likes. Treats all
+  // sparse array-likes as if they were dense.
+  _.each = _.forEach = function(obj, iteratee, context) {
     if (obj == null) return obj;
-    if (nativeForEach && obj.forEach === nativeForEach) {
-      obj.forEach(iterator, context);
-    } else if (obj.length === +obj.length) {
-      for (var i = 0, length = obj.length; i < length; i++) {
-        if (iterator.call(context, obj[i], i, obj) === breaker) return;
+    iteratee = createCallback(iteratee, context);
+    var i, length = obj.length;
+    if (length === +length) {
+      for (i = 0; i < length; i++) {
+        iteratee(obj[i], i, obj);
       }
     } else {
       var keys = _.keys(obj);
-      for (var i = 0, length = keys.length; i < length; i++) {
-        if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
+      for (i = 0, length = keys.length; i < length; i++) {
+        iteratee(obj[keys[i]], keys[i], obj);
       }
     }
     return obj;
   };
 
-  // Return the results of applying the iterator to each element.
-  // Delegates to **ECMAScript 5**'s native `map` if available.
-  _.map = _.collect = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
-    each(obj, function(value, index, list) {
-      results.push(iterator.call(context, value, index, list));
-    });
+  // Return the results of applying the iteratee to each element.
+  _.map = _.collect = function(obj, iteratee, context) {
+    if (obj == null) return [];
+    iteratee = _.iteratee(iteratee, context);
+    var keys = obj.length !== +obj.length && _.keys(obj),
+        length = (keys || obj).length,
+        results = Array(length),
+        currentKey;
+    for (var index = 0; index < length; index++) {
+      currentKey = keys ? keys[index] : index;
+      results[index] = iteratee(obj[currentKey], currentKey, obj);
+    }
     return results;
   };
 
   var reduceError = 'Reduce of empty array with no initial value';
 
   // **Reduce** builds up a single result from a list of values, aka `inject`,
-  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
-  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
+  // or `foldl`.
+  _.reduce = _.foldl = _.inject = function(obj, iteratee, memo, context) {
     if (obj == null) obj = [];
-    if (nativeReduce && obj.reduce === nativeReduce) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
-    }
-    each(obj, function(value, index, list) {
-      if (!initial) {
-        memo = value;
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, value, index, list);
-      }
-    });
-    if (!initial) throw new TypeError(reduceError);
+    iteratee = createCallback(iteratee, context, 4);
+    var keys = obj.length !== +obj.length && _.keys(obj),
+        length = (keys || obj).length,
+        index = 0, currentKey;
+    if (arguments.length < 3) {
+      if (!length) throw new TypeError(reduceError);
+      memo = obj[keys ? keys[index++] : index++];
+    }
+    for (; index < length; index++) {
+      currentKey = keys ? keys[index] : index;
+      memo = iteratee(memo, obj[currentKey], currentKey, obj);
+    }
     return memo;
   };
 
   // The right-associative version of reduce, also known as `foldr`.
-  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
-  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
+  _.reduceRight = _.foldr = function(obj, iteratee, memo, context) {
     if (obj == null) obj = [];
-    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+    iteratee = createCallback(iteratee, context, 4);
+    var keys = obj.length !== + obj.length && _.keys(obj),
+        index = (keys || obj).length,
+        currentKey;
+    if (arguments.length < 3) {
+      if (!index) throw new TypeError(reduceError);
+      memo = obj[keys ? keys[--index] : --index];
     }
-    var length = obj.length;
-    if (length !== +length) {
-      var keys = _.keys(obj);
-      length = keys.length;
+    while (index--) {
+      currentKey = keys ? keys[index] : index;
+      memo = iteratee(memo, obj[currentKey], currentKey, obj);
     }
-    each(obj, function(value, index, list) {
-      index = keys ? keys[--length] : --length;
-      if (!initial) {
-        memo = obj[index];
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, obj[index], index, list);
-      }
-    });
-    if (!initial) throw new TypeError(reduceError);
     return memo;
   };
 
   // Return the first value which passes a truth test. Aliased as `detect`.
   _.find = _.detect = function(obj, predicate, context) {
     var result;
-    any(obj, function(value, index, list) {
-      if (predicate.call(context, value, index, list)) {
+    predicate = _.iteratee(predicate, context);
+    _.some(obj, function(value, index, list) {
+      if (predicate(value, index, list)) {
         result = value;
         return true;
       }
@@ -5570,61 +5584,58 @@ if (typeof module !== 'undefined' && module.exports) {
   };
 
   // Return all the elements that pass a truth test.
-  // Delegates to **ECMAScript 5**'s native `filter` if available.
   // Aliased as `select`.
   _.filter = _.select = function(obj, predicate, context) {
     var results = [];
     if (obj == null) return results;
-    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(predicate, context);
-    each(obj, function(value, index, list) {
-      if (predicate.call(context, value, index, list)) results.push(value);
+    predicate = _.iteratee(predicate, context);
+    _.each(obj, function(value, index, list) {
+      if (predicate(value, index, list)) results.push(value);
     });
     return results;
   };
 
   // Return all the elements for which a truth test fails.
   _.reject = function(obj, predicate, context) {
-    return _.filter(obj, function(value, index, list) {
-      return !predicate.call(context, value, index, list);
-    }, context);
+    return _.filter(obj, _.negate(_.iteratee(predicate)), context);
   };
 
   // Determine whether all of the elements match a truth test.
-  // Delegates to **ECMAScript 5**'s native `every` if available.
   // Aliased as `all`.
   _.every = _.all = function(obj, predicate, context) {
-    predicate || (predicate = _.identity);
-    var result = true;
-    if (obj == null) return result;
-    if (nativeEvery && obj.every === nativeEvery) return obj.every(predicate, context);
-    each(obj, function(value, index, list) {
-      if (!(result = result && predicate.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
+    if (obj == null) return true;
+    predicate = _.iteratee(predicate, context);
+    var keys = obj.length !== +obj.length && _.keys(obj),
+        length = (keys || obj).length,
+        index, currentKey;
+    for (index = 0; index < length; index++) {
+      currentKey = keys ? keys[index] : index;
+      if (!predicate(obj[currentKey], currentKey, obj)) return false;
+    }
+    return true;
   };
 
   // Determine if at least one element in the object matches a truth test.
-  // Delegates to **ECMAScript 5**'s native `some` if available.
   // Aliased as `any`.
-  var any = _.some = _.any = function(obj, predicate, context) {
-    predicate || (predicate = _.identity);
-    var result = false;
-    if (obj == null) return result;
-    if (nativeSome && obj.some === nativeSome) return obj.some(predicate, context);
-    each(obj, function(value, index, list) {
-      if (result || (result = predicate.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
+  _.some = _.any = function(obj, predicate, context) {
+    if (obj == null) return false;
+    predicate = _.iteratee(predicate, context);
+    var keys = obj.length !== +obj.length && _.keys(obj),
+        length = (keys || obj).length,
+        index, currentKey;
+    for (index = 0; index < length; index++) {
+      currentKey = keys ? keys[index] : index;
+      if (predicate(obj[currentKey], currentKey, obj)) return true;
+    }
+    return false;
   };
 
   // Determine if the array or object contains a given value (using `===`).
   // Aliased as `include`.
   _.contains = _.include = function(obj, target) {
     if (obj == null) return false;
-    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    return any(obj, function(value) {
-      return value === target;
-    });
+    if (obj.length !== +obj.length) obj = _.values(obj);
+    return _.indexOf(obj, target) >= 0;
   };
 
   // Invoke a method (with arguments) on every item in a collection.
@@ -5653,51 +5664,67 @@ if (typeof module !== 'undefined' && module.exports) {
     return _.find(obj, _.matches(attrs));
   };
 
-  // Return the maximum element or (element-based computation).
-  // Can't optimize arrays of integers longer than 65,535 elements.
-  // See [WebKit Bug 80797](https://bugs.webkit.org/show_bug.cgi?id=80797)
-  _.max = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
-      return Math.max.apply(Math, obj);
-    }
-    var result = -Infinity, lastComputed = -Infinity;
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      if (computed > lastComputed) {
-        result = value;
-        lastComputed = computed;
+  // Return the maximum element (or element-based computation).
+  _.max = function(obj, iteratee, context) {
+    var result = -Infinity, lastComputed = -Infinity,
+        value, computed;
+    if (iteratee == null && obj != null) {
+      obj = obj.length === +obj.length ? obj : _.values(obj);
+      for (var i = 0, length = obj.length; i < length; i++) {
+        value = obj[i];
+        if (value > result) {
+          result = value;
+        }
       }
-    });
+    } else {
+      iteratee = _.iteratee(iteratee, context);
+      _.each(obj, function(value, index, list) {
+        computed = iteratee(value, index, list);
+        if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
+          result = value;
+          lastComputed = computed;
+        }
+      });
+    }
     return result;
   };
 
   // Return the minimum element (or element-based computation).
-  _.min = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
-      return Math.min.apply(Math, obj);
-    }
-    var result = Infinity, lastComputed = Infinity;
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      if (computed < lastComputed) {
-        result = value;
-        lastComputed = computed;
+  _.min = function(obj, iteratee, context) {
+    var result = Infinity, lastComputed = Infinity,
+        value, computed;
+    if (iteratee == null && obj != null) {
+      obj = obj.length === +obj.length ? obj : _.values(obj);
+      for (var i = 0, length = obj.length; i < length; i++) {
+        value = obj[i];
+        if (value < result) {
+          result = value;
+        }
       }
-    });
+    } else {
+      iteratee = _.iteratee(iteratee, context);
+      _.each(obj, function(value, index, list) {
+        computed = iteratee(value, index, list);
+        if (computed < lastComputed || computed === Infinity && result === Infinity) {
+          result = value;
+          lastComputed = computed;
+        }
+      });
+    }
     return result;
   };
 
-  // Shuffle an array, using the modern version of the
+  // Shuffle a collection, using the modern version of the
   // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
   _.shuffle = function(obj) {
-    var rand;
-    var index = 0;
-    var shuffled = [];
-    each(obj, function(value) {
-      rand = _.random(index++);
-      shuffled[index - 1] = shuffled[rand];
-      shuffled[rand] = value;
-    });
+    var set = obj && obj.length === +obj.length ? obj : _.values(obj);
+    var length = set.length;
+    var shuffled = Array(length);
+    for (var index = 0, rand; index < length; index++) {
+      rand = _.random(0, index);
+      if (rand !== index) shuffled[index] = shuffled[rand];
+      shuffled[rand] = set[index];
+    }
     return shuffled;
   };
 
@@ -5712,21 +5739,14 @@ if (typeof module !== 'undefined' && module.exports) {
     return _.shuffle(obj).slice(0, Math.max(0, n));
   };
 
-  // An internal function to generate lookup iterators.
-  var lookupIterator = function(value) {
-    if (value == null) return _.identity;
-    if (_.isFunction(value)) return value;
-    return _.property(value);
-  };
-
-  // Sort the object's values by a criterion produced by an iterator.
-  _.sortBy = function(obj, iterator, context) {
-    iterator = lookupIterator(iterator);
+  // Sort the object's values by a criterion produced by an iteratee.
+  _.sortBy = function(obj, iteratee, context) {
+    iteratee = _.iteratee(iteratee, context);
     return _.pluck(_.map(obj, function(value, index, list) {
       return {
         value: value,
         index: index,
-        criteria: iterator.call(context, value, index, list)
+        criteria: iteratee(value, index, list)
       };
     }).sort(function(left, right) {
       var a = left.criteria;
@@ -5741,12 +5761,12 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // An internal function used for aggregate "group by" operations.
   var group = function(behavior) {
-    return function(obj, iterator, context) {
+    return function(obj, iteratee, context) {
       var result = {};
-      iterator = lookupIterator(iterator);
-      each(obj, function(value, index) {
-        var key = iterator.call(context, value, index, obj);
-        behavior(result, key, value);
+      iteratee = _.iteratee(iteratee, context);
+      _.each(obj, function(value, index) {
+        var key = iteratee(value, index, obj);
+        behavior(result, value, key);
       });
       return result;
     };
@@ -5754,32 +5774,32 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Groups the object's values by a criterion. Pass either a string attribute
   // to group by, or a function that returns the criterion.
-  _.groupBy = group(function(result, key, value) {
-    _.has(result, key) ? result[key].push(value) : result[key] = [value];
+  _.groupBy = group(function(result, value, key) {
+    if (_.has(result, key)) result[key].push(value); else result[key] = [value];
   });
 
   // Indexes the object's values by a criterion, similar to `groupBy`, but for
   // when you know that your index values will be unique.
-  _.indexBy = group(function(result, key, value) {
+  _.indexBy = group(function(result, value, key) {
     result[key] = value;
   });
 
   // Counts instances of an object that group by a certain criterion. Pass
   // either a string attribute to count by, or a function that returns the
   // criterion.
-  _.countBy = group(function(result, key) {
-    _.has(result, key) ? result[key]++ : result[key] = 1;
+  _.countBy = group(function(result, value, key) {
+    if (_.has(result, key)) result[key]++; else result[key] = 1;
   });
 
   // Use a comparator function to figure out the smallest index at which
   // an object should be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iterator, context) {
-    iterator = lookupIterator(iterator);
-    var value = iterator.call(context, obj);
+  _.sortedIndex = function(array, obj, iteratee, context) {
+    iteratee = _.iteratee(iteratee, context, 1);
+    var value = iteratee(obj);
     var low = 0, high = array.length;
     while (low < high) {
-      var mid = (low + high) >>> 1;
-      iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid;
+      var mid = low + high >>> 1;
+      if (iteratee(array[mid]) < value) low = mid + 1; else high = mid;
     }
     return low;
   };
@@ -5795,7 +5815,18 @@ if (typeof module !== 'undefined' && module.exports) {
   // Return the number of elements in an object.
   _.size = function(obj) {
     if (obj == null) return 0;
-    return (obj.length === +obj.length) ? obj.length : _.keys(obj).length;
+    return obj.length === +obj.length ? obj.length : _.keys(obj).length;
+  };
+
+  // Split a collection into two arrays: one whose elements all satisfy the given
+  // predicate, and one whose elements all do not satisfy the predicate.
+  _.partition = function(obj, predicate, context) {
+    predicate = _.iteratee(predicate, context);
+    var pass = [], fail = [];
+    _.each(obj, function(value, key, obj) {
+      (predicate(value, key, obj) ? pass : fail).push(value);
+    });
+    return [pass, fail];
   };
 
   // Array Functions
@@ -5806,7 +5837,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // allows it to work with `_.map`.
   _.first = _.head = _.take = function(array, n, guard) {
     if (array == null) return void 0;
-    if ((n == null) || guard) return array[0];
+    if (n == null || guard) return array[0];
     if (n < 0) return [];
     return slice.call(array, 0, n);
   };
@@ -5816,14 +5847,14 @@ if (typeof module !== 'undefined' && module.exports) {
   // the array, excluding the last N. The **guard** check allows it to work with
   // `_.map`.
   _.initial = function(array, n, guard) {
-    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
+    return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n)));
   };
 
   // Get the last element of an array. Passing **n** will return the last N
   // values in the array. The **guard** check allows it to work with `_.map`.
   _.last = function(array, n, guard) {
     if (array == null) return void 0;
-    if ((n == null) || guard) return array[array.length - 1];
+    if (n == null || guard) return array[array.length - 1];
     return slice.call(array, Math.max(array.length - n, 0));
   };
 
@@ -5832,7 +5863,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // the rest N values in the array. The **guard**
   // check allows it to work with `_.map`.
   _.rest = _.tail = _.drop = function(array, n, guard) {
-    return slice.call(array, (n == null) || guard ? 1 : n);
+    return slice.call(array, n == null || guard ? 1 : n);
   };
 
   // Trim out all falsy values from an array.
@@ -5841,23 +5872,26 @@ if (typeof module !== 'undefined' && module.exports) {
   };
 
   // Internal implementation of a recursive `flatten` function.
-  var flatten = function(input, shallow, output) {
+  var flatten = function(input, shallow, strict, output) {
     if (shallow && _.every(input, _.isArray)) {
       return concat.apply(output, input);
     }
-    each(input, function(value) {
-      if (_.isArray(value) || _.isArguments(value)) {
-        shallow ? push.apply(output, value) : flatten(value, shallow, output);
+    for (var i = 0, length = input.length; i < length; i++) {
+      var value = input[i];
+      if (!_.isArray(value) && !_.isArguments(value)) {
+        if (!strict) output.push(value);
+      } else if (shallow) {
+        push.apply(output, value);
       } else {
-        output.push(value);
+        flatten(value, shallow, strict, output);
       }
-    });
+    }
     return output;
   };
 
   // Flatten out an array, either recursively (by default), or just one level.
   _.flatten = function(array, shallow) {
-    return flatten(array, shallow, []);
+    return flatten(array, shallow, false, []);
   };
 
   // Return a version of the array that does not contain the specified value(s).
@@ -5865,68 +5899,77 @@ if (typeof module !== 'undefined' && module.exports) {
     return _.difference(array, slice.call(arguments, 1));
   };
 
-  // Split an array into two arrays: one whose elements all satisfy the given
-  // predicate, and one whose elements all do not satisfy the predicate.
-  _.partition = function(array, predicate) {
-    var pass = [], fail = [];
-    each(array, function(elem) {
-      (predicate(elem) ? pass : fail).push(elem);
-    });
-    return [pass, fail];
-  };
-
   // Produce a duplicate-free version of the array. If the array has already
   // been sorted, you have the option of using a faster algorithm.
   // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted, iterator, context) {
-    if (_.isFunction(isSorted)) {
-      context = iterator;
-      iterator = isSorted;
+  _.uniq = _.unique = function(array, isSorted, iteratee, context) {
+    if (array == null) return [];
+    if (!_.isBoolean(isSorted)) {
+      context = iteratee;
+      iteratee = isSorted;
       isSorted = false;
     }
-    var initial = iterator ? _.map(array, iterator, context) : array;
-    var results = [];
+    if (iteratee != null) iteratee = _.iteratee(iteratee, context);
+    var result = [];
     var seen = [];
-    each(initial, function(value, index) {
-      if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) {
-        seen.push(value);
-        results.push(array[index]);
+    for (var i = 0, length = array.length; i < length; i++) {
+      var value = array[i];
+      if (isSorted) {
+        if (!i || seen !== value) result.push(value);
+        seen = value;
+      } else if (iteratee) {
+        var computed = iteratee(value, i, array);
+        if (_.indexOf(seen, computed) < 0) {
+          seen.push(computed);
+          result.push(value);
+        }
+      } else if (_.indexOf(result, value) < 0) {
+        result.push(value);
       }
-    });
-    return results;
+    }
+    return result;
   };
 
   // Produce an array that contains the union: each distinct element from all of
   // the passed-in arrays.
   _.union = function() {
-    return _.uniq(_.flatten(arguments, true));
+    return _.uniq(flatten(arguments, true, true, []));
   };
 
   // Produce an array that contains every item shared between all the
   // passed-in arrays.
   _.intersection = function(array) {
-    var rest = slice.call(arguments, 1);
-    return _.filter(_.uniq(array), function(item) {
-      return _.every(rest, function(other) {
-        return _.contains(other, item);
-      });
-    });
+    if (array == null) return [];
+    var result = [];
+    var argsLength = arguments.length;
+    for (var i = 0, length = array.length; i < length; i++) {
+      var item = array[i];
+      if (_.contains(result, item)) continue;
+      for (var j = 1; j < argsLength; j++) {
+        if (!_.contains(arguments[j], item)) break;
+      }
+      if (j === argsLength) result.push(item);
+    }
+    return result;
   };
 
   // Take the difference between one array and a number of other arrays.
   // Only the elements present in just the first array will remain.
   _.difference = function(array) {
-    var rest = concat.apply(ArrayProto, slice.call(arguments, 1));
-    return _.filter(array, function(value){ return !_.contains(rest, value); });
+    var rest = flatten(slice.call(arguments, 1), true, true, []);
+    return _.filter(array, function(value){
+      return !_.contains(rest, value);
+    });
   };
 
   // Zip together multiple lists into a single array -- elements that share
   // an index go together.
-  _.zip = function() {
-    var length = _.max(_.pluck(arguments, 'length').concat(0));
-    var results = new Array(length);
+  _.zip = function(array) {
+    if (array == null) return [];
+    var length = _.max(arguments, 'length').length;
+    var results = Array(length);
     for (var i = 0; i < length; i++) {
-      results[i] = _.pluck(arguments, '' + i);
+      results[i] = _.pluck(arguments, i);
     }
     return results;
   };
@@ -5947,10 +5990,8 @@ if (typeof module !== 'undefined' && module.exports) {
     return result;
   };
 
-  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
-  // we need this function. Return the position of the first occurrence of an
-  // item in an array, or -1 if the item is not included in the array.
-  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
+  // Return the position of the first occurrence of an item in an array,
+  // or -1 if the item is not included in the array.
   // If the array is large and already in sort order, pass `true`
   // for **isSorted** to use binary search.
   _.indexOf = function(array, item, isSorted) {
@@ -5958,26 +5999,23 @@ if (typeof module !== 'undefined' && module.exports) {
     var i = 0, length = array.length;
     if (isSorted) {
       if (typeof isSorted == 'number') {
-        i = (isSorted < 0 ? Math.max(0, length + isSorted) : isSorted);
+        i = isSorted < 0 ? Math.max(0, length + isSorted) : isSorted;
       } else {
         i = _.sortedIndex(array, item);
         return array[i] === item ? i : -1;
       }
     }
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
     for (; i < length; i++) if (array[i] === item) return i;
     return -1;
   };
 
-  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
   _.lastIndexOf = function(array, item, from) {
     if (array == null) return -1;
-    var hasIndex = from != null;
-    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) {
-      return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item);
+    var idx = array.length;
+    if (typeof from == 'number') {
+      idx = from < 0 ? idx + from + 1 : Math.min(idx, from + 1);
     }
-    var i = (hasIndex ? from : array.length);
-    while (i--) if (array[i] === item) return i;
+    while (--idx >= 0) if (array[idx] === item) return idx;
     return -1;
   };
 
@@ -5989,15 +6027,13 @@ if (typeof module !== 'undefined' && module.exports) {
       stop = start || 0;
       start = 0;
     }
-    step = arguments[2] || 1;
+    step = step || 1;
 
     var length = Math.max(Math.ceil((stop - start) / step), 0);
-    var idx = 0;
-    var range = new Array(length);
+    var range = Array(length);
 
-    while(idx < length) {
-      range[idx++] = start;
-      start += step;
+    for (var idx = 0; idx < length; idx++, start += step) {
+      range[idx] = start;
     }
 
     return range;
@@ -6007,7 +6043,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // ------------------
 
   // Reusable constructor function for prototype setting.
-  var ctor = function(){};
+  var Ctor = function(){};
 
   // Create a function bound to a given object (assigning `this`, and arguments,
   // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
@@ -6015,17 +6051,18 @@ if (typeof module !== 'undefined' && module.exports) {
   _.bind = function(func, context) {
     var args, bound;
     if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError;
+    if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function');
     args = slice.call(arguments, 2);
-    return bound = function() {
+    bound = function() {
       if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      ctor.prototype = func.prototype;
-      var self = new ctor;
-      ctor.prototype = null;
+      Ctor.prototype = func.prototype;
+      var self = new Ctor;
+      Ctor.prototype = null;
       var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (Object(result) === result) return result;
+      if (_.isObject(result)) return result;
       return self;
     };
+    return bound;
   };
 
   // Partially apply a function by creating a version that has had some of its
@@ -6048,27 +6085,34 @@ if (typeof module !== 'undefined' && module.exports) {
   // are the method names to be bound. Useful for ensuring that all callbacks
   // defined on an object belong to it.
   _.bindAll = function(obj) {
-    var funcs = slice.call(arguments, 1);
-    if (funcs.length === 0) throw new Error('bindAll must be passed function names');
-    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
+    var i, length = arguments.length, key;
+    if (length <= 1) throw new Error('bindAll must be passed function names');
+    for (i = 1; i < length; i++) {
+      key = arguments[i];
+      obj[key] = _.bind(obj[key], obj);
+    }
     return obj;
   };
 
   // Memoize an expensive function by storing its results.
   _.memoize = function(func, hasher) {
-    var memo = {};
-    hasher || (hasher = _.identity);
-    return function() {
-      var key = hasher.apply(this, arguments);
-      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
+    var memoize = function(key) {
+      var cache = memoize.cache;
+      var address = hasher ? hasher.apply(this, arguments) : key;
+      if (!_.has(cache, address)) cache[address] = func.apply(this, arguments);
+      return cache[address];
     };
+    memoize.cache = {};
+    return memoize;
   };
 
   // Delays a function for the given number of milliseconds, and then calls
   // it with the arguments supplied.
   _.delay = function(func, wait) {
     var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(null, args); }, wait);
+    return setTimeout(function(){
+      return func.apply(null, args);
+    }, wait);
   };
 
   // Defers a function, scheduling it to run after the current call stack has
@@ -6086,12 +6130,12 @@ if (typeof module !== 'undefined' && module.exports) {
     var context, args, result;
     var timeout = null;
     var previous = 0;
-    options || (options = {});
+    if (!options) options = {};
     var later = function() {
       previous = options.leading === false ? 0 : _.now();
       timeout = null;
       result = func.apply(context, args);
-      context = args = null;
+      if (!timeout) context = args = null;
     };
     return function() {
       var now = _.now();
@@ -6099,12 +6143,12 @@ if (typeof module !== 'undefined' && module.exports) {
       var remaining = wait - (now - previous);
       context = this;
       args = arguments;
-      if (remaining <= 0) {
+      if (remaining <= 0 || remaining > wait) {
         clearTimeout(timeout);
         timeout = null;
         previous = now;
         result = func.apply(context, args);
-        context = args = null;
+        if (!timeout) context = args = null;
       } else if (!timeout && options.trailing !== false) {
         timeout = setTimeout(later, remaining);
       }
@@ -6121,13 +6165,14 @@ if (typeof module !== 'undefined' && module.exports) {
 
     var later = function() {
       var last = _.now() - timestamp;
-      if (last < wait) {
+
+      if (last < wait && last > 0) {
         timeout = setTimeout(later, wait - last);
       } else {
         timeout = null;
         if (!immediate) {
           result = func.apply(context, args);
-          context = args = null;
+          if (!timeout) context = args = null;
         }
       }
     };
@@ -6137,9 +6182,7 @@ if (typeof module !== 'undefined' && module.exports) {
       args = arguments;
       timestamp = _.now();
       var callNow = immediate && !timeout;
-      if (!timeout) {
-        timeout = setTimeout(later, wait);
-      }
+      if (!timeout) timeout = setTimeout(later, wait);
       if (callNow) {
         result = func.apply(context, args);
         context = args = null;
@@ -6149,19 +6192,6 @@ if (typeof module !== 'undefined' && module.exports) {
     };
   };
 
-  // Returns a function that will be executed at most one time, no matter how
-  // often you call it. Useful for lazy initialization.
-  _.once = function(func) {
-    var ran = false, memo;
-    return function() {
-      if (ran) return memo;
-      ran = true;
-      memo = func.apply(this, arguments);
-      func = null;
-      return memo;
-    };
-  };
-
   // Returns the first function passed as an argument to the second,
   // allowing you to adjust arguments, run code before and after, and
   // conditionally execute the original function.
@@ -6169,16 +6199,23 @@ if (typeof module !== 'undefined' && module.exports) {
     return _.partial(wrapper, func);
   };
 
+  // Returns a negated version of the passed-in predicate.
+  _.negate = function(predicate) {
+    return function() {
+      return !predicate.apply(this, arguments);
+    };
+  };
+
   // Returns a function that is the composition of a list of functions, each
   // consuming the return value of the function that follows.
   _.compose = function() {
-    var funcs = arguments;
+    var args = arguments;
+    var start = args.length - 1;
     return function() {
-      var args = arguments;
-      for (var i = funcs.length - 1; i >= 0; i--) {
-        args = [funcs[i].apply(this, args)];
-      }
-      return args[0];
+      var i = start;
+      var result = args[start].apply(this, arguments);
+      while (i--) result = args[i].call(this, result);
+      return result;
     };
   };
 
@@ -6191,6 +6228,23 @@ if (typeof module !== 'undefined' && module.exports) {
     };
   };
 
+  // Returns a function that will only be executed before being called N times.
+  _.before = function(times, func) {
+    var memo;
+    return function() {
+      if (--times > 0) {
+        memo = func.apply(this, arguments);
+      } else {
+        func = null;
+      }
+      return memo;
+    };
+  };
+
+  // Returns a function that will be executed at most one time, no matter how
+  // often you call it. Useful for lazy initialization.
+  _.once = _.partial(_.before, 2);
+
   // Object Functions
   // ----------------
 
@@ -6208,7 +6262,7 @@ if (typeof module !== 'undefined' && module.exports) {
   _.values = function(obj) {
     var keys = _.keys(obj);
     var length = keys.length;
-    var values = new Array(length);
+    var values = Array(length);
     for (var i = 0; i < length; i++) {
       values[i] = obj[keys[i]];
     }
@@ -6219,7 +6273,7 @@ if (typeof module !== 'undefined' && module.exports) {
   _.pairs = function(obj) {
     var keys = _.keys(obj);
     var length = keys.length;
-    var pairs = new Array(length);
+    var pairs = Array(length);
     for (var i = 0; i < length; i++) {
       pairs[i] = [keys[i], obj[keys[i]]];
     }
@@ -6248,45 +6302,62 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Extend a given object with all the properties in passed-in object(s).
   _.extend = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      if (source) {
-        for (var prop in source) {
-          obj[prop] = source[prop];
+    if (!_.isObject(obj)) return obj;
+    var source, prop;
+    for (var i = 1, length = arguments.length; i < length; i++) {
+      source = arguments[i];
+      for (prop in source) {
+        if (hasOwnProperty.call(source, prop)) {
+            obj[prop] = source[prop];
         }
       }
-    });
+    }
     return obj;
   };
 
   // Return a copy of the object only containing the whitelisted properties.
-  _.pick = function(obj) {
-    var copy = {};
-    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
-    each(keys, function(key) {
-      if (key in obj) copy[key] = obj[key];
-    });
-    return copy;
+  _.pick = function(obj, iteratee, context) {
+    var result = {}, key;
+    if (obj == null) return result;
+    if (_.isFunction(iteratee)) {
+      iteratee = createCallback(iteratee, context);
+      for (key in obj) {
+        var value = obj[key];
+        if (iteratee(value, key, obj)) result[key] = value;
+      }
+    } else {
+      var keys = concat.apply([], slice.call(arguments, 1));
+      obj = new Object(obj);
+      for (var i = 0, length = keys.length; i < length; i++) {
+        key = keys[i];
+        if (key in obj) result[key] = obj[key];
+      }
+    }
+    return result;
   };
 
    // Return a copy of the object without the blacklisted properties.
-  _.omit = function(obj) {
-    var copy = {};
-    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
-    for (var key in obj) {
-      if (!_.contains(keys, key)) copy[key] = obj[key];
+  _.omit = function(obj, iteratee, context) {
+    if (_.isFunction(iteratee)) {
+      iteratee = _.negate(iteratee);
+    } else {
+      var keys = _.map(concat.apply([], slice.call(arguments, 1)), String);
+      iteratee = function(value, key) {
+        return !_.contains(keys, key);
+      };
     }
-    return copy;
+    return _.pick(obj, iteratee, context);
   };
 
   // Fill in a given object with default properties.
   _.defaults = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      if (source) {
-        for (var prop in source) {
-          if (obj[prop] === void 0) obj[prop] = source[prop];
-        }
+    if (!_.isObject(obj)) return obj;
+    for (var i = 1, length = arguments.length; i < length; i++) {
+      var source = arguments[i];
+      for (var prop in source) {
+        if (obj[prop] === void 0) obj[prop] = source[prop];
       }
-    });
+    }
     return obj;
   };
 
@@ -6308,7 +6379,7 @@ if (typeof module !== 'undefined' && module.exports) {
   var eq = function(a, b, aStack, bStack) {
     // Identical objects are equal. `0 === -0`, but they aren't identical.
     // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
-    if (a === b) return a !== 0 || 1 / a == 1 / b;
+    if (a === b) return a !== 0 || 1 / a === 1 / b;
     // A strict comparison is necessary because `null == undefined`.
     if (a == null || b == null) return a === b;
     // Unwrap any wrapped objects.
@@ -6316,29 +6387,27 @@ if (typeof module !== 'undefined' && module.exports) {
     if (b instanceof _) b = b._wrapped;
     // Compare `[[Class]]` names.
     var className = toString.call(a);
-    if (className != toString.call(b)) return false;
+    if (className !== toString.call(b)) return false;
     switch (className) {
-      // Strings, numbers, dates, and booleans are compared by value.
+      // Strings, numbers, regular expressions, dates, and booleans are compared by value.
+      case '[object RegExp]':
+      // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')
       case '[object String]':
         // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
         // equivalent to `new String("5")`.
-        return a == String(b);
+        return '' + a === '' + b;
       case '[object Number]':
-        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
-        // other numeric values.
-        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
+        // `NaN`s are equivalent, but non-reflexive.
+        // Object(NaN) is equivalent to NaN
+        if (+a !== +a) return +b !== +b;
+        // An `egal` comparison is performed for other numeric values.
+        return +a === 0 ? 1 / +a === 1 / b : +a === +b;
       case '[object Date]':
       case '[object Boolean]':
         // Coerce dates and booleans to numeric primitive values. Dates are compared by their
         // millisecond representations. Note that invalid dates with millisecond representations
         // of `NaN` are not equivalent.
-        return +a == +b;
-      // RegExps are compared by their source patterns and flags.
-      case '[object RegExp]':
-        return a.source == b.source &&
-               a.global == b.global &&
-               a.multiline == b.multiline &&
-               a.ignoreCase == b.ignoreCase;
+        return +a === +b;
     }
     if (typeof a != 'object' || typeof b != 'object') return false;
     // Assume equality for cyclic structures. The algorithm for detecting cyclic
@@ -6347,25 +6416,29 @@ if (typeof module !== 'undefined' && module.exports) {
     while (length--) {
       // Linear search. Performance is inversely proportional to the number of
       // unique nested structures.
-      if (aStack[length] == a) return bStack[length] == b;
+      if (aStack[length] === a) return bStack[length] === b;
     }
     // Objects with different constructors are not equivalent, but `Object`s
     // from different frames are.
     var aCtor = a.constructor, bCtor = b.constructor;
-    if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
-                             _.isFunction(bCtor) && (bCtor instanceof bCtor))
-                        && ('constructor' in a && 'constructor' in b)) {
+    if (
+      aCtor !== bCtor &&
+      // Handle Object.create(x) cases
+      'constructor' in a && 'constructor' in b &&
+      !(_.isFunction(aCtor) && aCtor instanceof aCtor &&
+        _.isFunction(bCtor) && bCtor instanceof bCtor)
+    ) {
       return false;
     }
     // Add the first object to the stack of traversed objects.
     aStack.push(a);
     bStack.push(b);
-    var size = 0, result = true;
+    var size, result;
     // Recursively compare objects and arrays.
-    if (className == '[object Array]') {
+    if (className === '[object Array]') {
       // Compare array lengths to determine if a deep comparison is necessary.
       size = a.length;
-      result = size == b.length;
+      result = size === b.length;
       if (result) {
         // Deep compare the contents, ignoring non-numeric properties.
         while (size--) {
@@ -6374,20 +6447,16 @@ if (typeof module !== 'undefined' && module.exports) {
       }
     } else {
       // Deep compare objects.
-      for (var key in a) {
-        if (_.has(a, key)) {
-          // Count the expected number of properties.
-          size++;
-          // Deep compare each member.
-          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
-        }
-      }
-      // Ensure that both objects contain the same number of properties.
+      var keys = _.keys(a), key;
+      size = keys.length;
+      // Ensure that both objects contain the same number of properties before comparing deep equality.
+      result = _.keys(b).length === size;
       if (result) {
-        for (key in b) {
-          if (_.has(b, key) && !(size--)) break;
+        while (size--) {
+          // Deep compare each member
+          key = keys[size];
+          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
         }
-        result = !size;
       }
     }
     // Remove the first object from the stack of traversed objects.
@@ -6405,7 +6474,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // An "empty" object has no enumerable own-properties.
   _.isEmpty = function(obj) {
     if (obj == null) return true;
-    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
+    if (_.isArray(obj) || _.isString(obj) || _.isArguments(obj)) return obj.length === 0;
     for (var key in obj) if (_.has(obj, key)) return false;
     return true;
   };
@@ -6418,18 +6487,19 @@ if (typeof module !== 'undefined' && module.exports) {
   // Is a given value an array?
   // Delegates to ECMA5's native Array.isArray
   _.isArray = nativeIsArray || function(obj) {
-    return toString.call(obj) == '[object Array]';
+    return toString.call(obj) === '[object Array]';
   };
 
   // Is a given variable an object?
   _.isObject = function(obj) {
-    return obj === Object(obj);
+    var type = typeof obj;
+    return type === 'function' || type === 'object' && !!obj;
   };
 
   // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp.
-  each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) {
+  _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) {
     _['is' + name] = function(obj) {
-      return toString.call(obj) == '[object ' + name + ']';
+      return toString.call(obj) === '[object ' + name + ']';
     };
   });
 
@@ -6437,14 +6507,14 @@ if (typeof module !== 'undefined' && module.exports) {
   // there isn't any inspectable "Arguments" type.
   if (!_.isArguments(arguments)) {
     _.isArguments = function(obj) {
-      return !!(obj && _.has(obj, 'callee'));
+      return _.has(obj, 'callee');
     };
   }
 
-  // Optimize `isFunction` if appropriate.
-  if (typeof (/./) !== 'function') {
+  // Optimize `isFunction` if appropriate. Work around an IE 11 bug.
+  if (typeof /./ !== 'function') {
     _.isFunction = function(obj) {
-      return typeof obj === 'function';
+      return typeof obj == 'function' || false;
     };
   }
 
@@ -6455,12 +6525,12 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Is the given value `NaN`? (NaN is the only number which does not equal itself).
   _.isNaN = function(obj) {
-    return _.isNumber(obj) && obj != +obj;
+    return _.isNumber(obj) && obj !== +obj;
   };
 
   // Is a given value a boolean?
   _.isBoolean = function(obj) {
-    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
+    return obj === true || obj === false || toString.call(obj) === '[object Boolean]';
   };
 
   // Is a given value equal to null?
@@ -6476,7 +6546,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // Shortcut function for checking if an object has a given property directly
   // on itself (in other words, not on a prototype).
   _.has = function(obj, key) {
-    return hasOwnProperty.call(obj, key);
+    return obj != null && hasOwnProperty.call(obj, key);
   };
 
   // Utility Functions
@@ -6489,17 +6559,20 @@ if (typeof module !== 'undefined' && module.exports) {
     return this;
   };
 
-  // Keep the identity function around for default iterators.
+  // Keep the identity function around for default iteratees.
   _.identity = function(value) {
     return value;
   };
 
+  // Predicate-generating functions. Often useful outside of Underscore.
   _.constant = function(value) {
-    return function () {
+    return function() {
       return value;
     };
   };
 
+  _.noop = function(){};
+
   _.property = function(key) {
     return function(obj) {
       return obj[key];
@@ -6508,20 +6581,23 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Returns a predicate for checking whether an object has a given set of `key:value` pairs.
   _.matches = function(attrs) {
+    var pairs = _.pairs(attrs), length = pairs.length;
     return function(obj) {
-      if (obj === attrs) return true; //avoid comparing an object to itself.
-      for (var key in attrs) {
-        if (attrs[key] !== obj[key])
-          return false;
+      if (obj == null) return !length;
+      obj = new Object(obj);
+      for (var i = 0; i < length; i++) {
+        var pair = pairs[i], key = pair[0];
+        if (pair[1] !== obj[key] || !(key in obj)) return false;
       }
       return true;
-    }
+    };
   };
 
   // Run a function **n** times.
-  _.times = function(n, iterator, context) {
+  _.times = function(n, iteratee, context) {
     var accum = Array(Math.max(0, n));
-    for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i);
+    iteratee = createCallback(iteratee, context, 1);
+    for (var i = 0; i < n; i++) accum[i] = iteratee(i);
     return accum;
   };
 
@@ -6535,54 +6611,44 @@ if (typeof module !== 'undefined' && module.exports) {
   };
 
   // A (possibly faster) way to get the current timestamp as an integer.
-  _.now = Date.now || function() { return new Date().getTime(); };
-
-  // List of HTML entities for escaping.
-  var entityMap = {
-    escape: {
-      '&': '&amp;',
-      '<': '&lt;',
-      '>': '&gt;',
-      '"': '&quot;',
-      "'": '&#x27;'
-    }
+  _.now = Date.now || function() {
+    return new Date().getTime();
   };
-  entityMap.unescape = _.invert(entityMap.escape);
 
-  // Regexes containing the keys and values listed immediately above.
-  var entityRegexes = {
-    escape:   new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'),
-    unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g')
+   // List of HTML entities for escaping.
+  var escapeMap = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#x27;',
+    '`': '&#x60;'
   };
+  var unescapeMap = _.invert(escapeMap);
 
   // Functions for escaping and unescaping strings to/from HTML interpolation.
-  _.each(['escape', 'unescape'], function(method) {
-    _[method] = function(string) {
-      if (string == null) return '';
-      return ('' + string).replace(entityRegexes[method], function(match) {
-        return entityMap[method][match];
-      });
+  var createEscaper = function(map) {
+    var escaper = function(match) {
+      return map[match];
     };
-  });
+    // Regexes for identifying a key that needs to be escaped
+    var source = '(?:' + _.keys(map).join('|') + ')';
+    var testRegexp = RegExp(source);
+    var replaceRegexp = RegExp(source, 'g');
+    return function(string) {
+      string = string == null ? '' : '' + string;
+      return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string;
+    };
+  };
+  _.escape = createEscaper(escapeMap);
+  _.unescape = createEscaper(unescapeMap);
 
   // If the value of the named `property` is a function then invoke it with the
   // `object` as context; otherwise, return it.
   _.result = function(object, property) {
     if (object == null) return void 0;
     var value = object[property];
-    return _.isFunction(value) ? value.call(object) : value;
-  };
-
-  // Add your own custom functions to the Underscore object.
-  _.mixin = function(obj) {
-    each(_.functions(obj), function(name) {
-      var func = _[name] = obj[name];
-      _.prototype[name] = function() {
-        var args = [this._wrapped];
-        push.apply(args, arguments);
-        return result.call(this, func.apply(_, args));
-      };
-    });
+    return _.isFunction(value) ? object[property]() : value;
   };
 
   // Generate a unique integer id (unique within the entire client session).
@@ -6613,22 +6679,26 @@ if (typeof module !== 'undefined' && module.exports) {
     '\\':     '\\',
     '\r':     'r',
     '\n':     'n',
-    '\t':     't',
     '\u2028': 'u2028',
     '\u2029': 'u2029'
   };
 
-  var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
+  var escaper = /\\|'|\r|\n|\u2028|\u2029/g;
+
+  var escapeChar = function(match) {
+    return '\\' + escapes[match];
+  };
 
   // JavaScript micro-templating, similar to John Resig's implementation.
   // Underscore templating handles arbitrary delimiters, preserves whitespace,
   // and correctly escapes quotes within interpolated code.
-  _.template = function(text, data, settings) {
-    var render;
+  // NB: `oldSettings` only exists for backwards compatibility.
+  _.template = function(text, settings, oldSettings) {
+    if (!settings && oldSettings) settings = oldSettings;
     settings = _.defaults({}, settings, _.templateSettings);
 
     // Combine delimiters into one regular expression via alternation.
-    var matcher = new RegExp([
+    var matcher = RegExp([
       (settings.escape || noMatch).source,
       (settings.interpolate || noMatch).source,
       (settings.evaluate || noMatch).source
@@ -6638,19 +6708,18 @@ if (typeof module !== 'undefined' && module.exports) {
     var index = 0;
     var source = "__p+='";
     text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
-      source += text.slice(index, offset)
-        .replace(escaper, function(match) { return '\\' + escapes[match]; });
+      source += text.slice(index, offset).replace(escaper, escapeChar);
+      index = offset + match.length;
 
       if (escape) {
         source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
-      }
-      if (interpolate) {
+      } else if (interpolate) {
         source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
-      }
-      if (evaluate) {
+      } else if (evaluate) {
         source += "';\n" + evaluate + "\n__p+='";
       }
-      index = offset + match.length;
+
+      // Adobe VMs need the match returned to produce the correct offest.
       return match;
     });
     source += "';\n";
@@ -6660,29 +6729,31 @@ if (typeof module !== 'undefined' && module.exports) {
 
     source = "var __t,__p='',__j=Array.prototype.join," +
       "print=function(){__p+=__j.call(arguments,'');};\n" +
-      source + "return __p;\n";
+      source + 'return __p;\n';
 
     try {
-      render = new Function(settings.variable || 'obj', '_', source);
+      var render = new Function(settings.variable || 'obj', '_', source);
     } catch (e) {
       e.source = source;
       throw e;
     }
 
-    if (data) return render(data, _);
     var template = function(data) {
       return render.call(this, data, _);
     };
 
-    // Provide the compiled function source as a convenience for precompilation.
-    template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
+    // Provide the compiled source as a convenience for precompilation.
+    var argument = settings.variable || 'obj';
+    template.source = 'function(' + argument + '){\n' + source + '}';
 
     return template;
   };
 
-  // Add a "chain" function, which will delegate to the wrapper.
+  // Add a "chain" function. Start chaining a wrapped Underscore object.
   _.chain = function(obj) {
-    return _(obj).chain();
+    var instance = _(obj);
+    instance._chain = true;
+    return instance;
   };
 
   // OOP
@@ -6696,42 +6767,44 @@ if (typeof module !== 'undefined' && module.exports) {
     return this._chain ? _(obj).chain() : obj;
   };
 
+  // Add your own custom functions to the Underscore object.
+  _.mixin = function(obj) {
+    _.each(_.functions(obj), function(name) {
+      var func = _[name] = obj[name];
+      _.prototype[name] = function() {
+        var args = [this._wrapped];
+        push.apply(args, arguments);
+        return result.call(this, func.apply(_, args));
+      };
+    });
+  };
+
   // Add all of the Underscore functions to the wrapper object.
   _.mixin(_);
 
   // Add all mutator Array functions to the wrapper.
-  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+  _.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
     var method = ArrayProto[name];
     _.prototype[name] = function() {
       var obj = this._wrapped;
       method.apply(obj, arguments);
-      if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0];
+      if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0];
       return result.call(this, obj);
     };
   });
 
   // Add all accessor Array functions to the wrapper.
-  each(['concat', 'join', 'slice'], function(name) {
+  _.each(['concat', 'join', 'slice'], function(name) {
     var method = ArrayProto[name];
     _.prototype[name] = function() {
       return result.call(this, method.apply(this._wrapped, arguments));
     };
   });
 
-  _.extend(_.prototype, {
-
-    // Start chaining a wrapped Underscore object.
-    chain: function() {
-      this._chain = true;
-      return this;
-    },
-
-    // Extracts the result from a wrapped and chained object.
-    value: function() {
-      return this._wrapped;
-    }
-
-  });
+  // Extracts the result from a wrapped and chained object.
+  _.prototype.value = function() {
+    return this._wrapped;
+  };
 
   // AMD registration happens at the end for compatibility with AMD loaders
   // that may not enforce next-turn semantics on modules. Even though general
@@ -6745,7 +6818,7 @@ if (typeof module !== 'undefined' && module.exports) {
       return _;
     });
   }
-}).call(this);
+}.call(this));
 //! moment.js
 //! version : 2.6.0
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -12834,10 +12907,10 @@ helpers = helpers || Handlebars.helpers; data = data || {};
     + "</span></th>\n          <th><span class=\"scrivito_sortable sort_down\" data-scrivito-private-sort-by=\"last_changed\">";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.row.last_changed", options) : helperMissing.call(depth0, "translate", "changes_list.row.last_changed", options)))
-    + "</span></th>\n        </tr>\n      </thead>\n      <tbody id=\"scrivito_changes_table_loaded\">\n      </tbody>\n      <tbody id=\"scrivito_changes_table_empty_result\" style=\"display:none;\">\n        <tr>\n          <td colspan=\"4\">\n            ";
+    + "</span></th>\n        </tr>\n      </thead>\n      <tbody id=\"scrivito_changes_table_loaded\">\n      </tbody>\n      <tbody id=\"scrivito_changes_table_empty_result\" style=\"display:none;\">\n        <tr>\n          <td colspan=\"5\">\n            ";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.empty_result", options) : helperMissing.call(depth0, "translate", "changes_list.empty_result", options)))
-    + "\n          </td>\n        </tr>\n      </tbody>\n      <tbody id=\"scrivito_changes_table_loading\">\n        <tr>\n          <td colspan=\"4\">\n            <i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i>\n          </td>\n        </tr>\n      </tbody>\n\n    </table>\n\n    <span class=\"scrivito_load_more\" style=\"display: none;\">";
+    + "\n          </td>\n        </tr>\n      </tbody>\n      <tbody id=\"scrivito_changes_table_loading\">\n        <tr>\n          <td colspan=\"5\">\n            <i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i>\n          </td>\n        </tr>\n      </tbody>\n\n    </table>\n\n    <span class=\"scrivito_load_more\" style=\"display: none;\">";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.more", options) : helperMissing.call(depth0, "translate", "changes_list.more", options)))
     + "</span>\n\n  </div>\n  <div class=\"scrivito_modal_footer\">\n    <a class=\"scrivito_button scrivito_cancel scrivito_green\" href=\"#\">";
@@ -13085,7 +13158,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   this.ScrivitoHandlebarsTemplates["details_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, stack2, options, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, self=this;
+  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, helperMissing=helpers.helperMissing;
 
 function program1(depth0,data) {
   
@@ -13098,11 +13171,12 @@ function program1(depth0,data) {
   else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "</i>";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "details_dialog.title", depth0.title, options) : helperMissing.call(depth0, "translate", "details_dialog.title", depth0.title, options)))
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
     + "</h3>\n    <div class=\"scrivito_details_dialog_saving_indicator\"></div>\n    ";
-  stack2 = helpers['if'].call(depth0, depth0.obj, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
+  stack1 = helpers['if'].call(depth0, depth0.obj, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n  </div>\n\n  <div class=\"scrivito_modal_body scrivito_auto_height\">\n    <i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i>\n    <div class=\"scrivito_details_dialog_markup\"></div>\n  </div>\n\n  <div class=\"scrivito_modal_footer\">\n    <a href=\"#\" class=\"scrivito_button scrivito_cancel scrivito_green\">";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "done", options) : helperMissing.call(depth0, "translate", "done", options)))
@@ -13301,64 +13375,19 @@ function program3(depth0,data) {
 
 function program5(depth0,data) {
   
-  var buffer = "", stack1;
+  var buffer = "", stack1, stack2;
   buffer += "\n      ";
-  stack1 = helpers['if'].call(depth0, depth0.is_present, {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
+  stack2 = ((stack1 = depth0.render),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
+  if(stack2 || stack2 === 0) { buffer += stack2; }
   buffer += "\n    ";
   return buffer;
   }
-function program6(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <li class=\"scrivito_menu_item scrivito_";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + " ";
-  stack1 = helpers['if'].call(depth0, depth0.is_disabled, {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">\n          <span title=\"";
-  stack1 = helpers['if'].call(depth0, depth0.is_enabled, {hash:{},inverse:self.program(11, program11, data),fn:self.program(9, program9, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">\n            <i class=\"scrivito_icon\">";
-  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</i>";
-  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\n          </span>\n        </li>\n      ";
-  return buffer;
-  }
-function program7(depth0,data) {
-  
-  
-  return "scrivito_disabled";
-  }
-
-function program9(depth0,data) {
-  
-  var stack1;
-  if (stack1 = helpers.tooltip) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.tooltip; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  return escapeExpression(stack1);
-  }
-
-function program11(depth0,data) {
-  
-  var stack1;
-  if (stack1 = helpers.reason_for_being_disabled) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.reason_for_being_disabled; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  return escapeExpression(stack1);
-  }
 
   buffer += "<div class=\"scrivito_editing_marker_menu\">\n  <ul class=\"scrivito_menu_box ";
   stack1 = helpers['if'].call(depth0, depth0.align, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\">\n    ";
-  stack1 = helpers.each.call(depth0, depth0.commands, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
+  stack1 = helpers.each.call(depth0, depth0.menu_items, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n  </ul>\n</div>\n";
   return buffer;
@@ -13373,7 +13402,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   
 
 
-  return "<div class=\"scrivito_topbar\">\n  <div class=\"scrivito_first_level\">\n    <div id=\"scrivito_menu_bar_toggle\" class=\"scrivito_viewmodes_wrapper\"></div>\n    <div class=\"scrivito_button_bar scrivito_app scrivito_no_hover\"><span class=\"scrivito_logo\"></span></div>\n    <div id=\"scrivito_select_workspace\" class=\"scrivito_button_bar\"></div>\n    <div id=\"scrivito_current_page_menu\" class=\"scrivito_button_bar scrivito_right\"></div>\n    <div id=\"scrivito_current_page_restriction\"></div>\n    <div id=\"scrivito_menu_bar_saving_indicator\"></div>\n  </div>\n</div>\n";
+  return "<div class=\"scrivito_topbar\">\n  <div class=\"scrivito_first_level\">\n    <div id=\"scrivito_menu_bar_toggle\" class=\"scrivito_viewmodes_wrapper\"></div>\n    <div class=\"scrivito_button_bar scrivito_app scrivito_no_hover\"><span class=\"scrivito_logo\"></span></div>\n    <div id=\"scrivito_workspace_select\" class=\"scrivito_button_bar\"></div>\n    <div id=\"scrivito_current_page_menu\" class=\"scrivito_button_bar scrivito_right\"></div>\n    <div id=\"scrivito_current_page_restriction\"></div>\n    <div id=\"scrivito_menu_bar_saving_indicator\"></div>\n  </div>\n</div>\n";
   });
   return this.ScrivitoHandlebarsTemplates["menu_bar"];
 }).call(this);
@@ -13412,30 +13441,102 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
-  this.ScrivitoHandlebarsTemplates["obj_menu"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.ScrivitoHandlebarsTemplates["menu_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, stack2, functionType="function", escapeExpression=this.escapeExpression, self=this;
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
 
 function program1(depth0,data) {
   
   
-  return "\n    scrivito_new\n  ";
+  return "scrivito_disabled";
   }
 
 function program3(depth0,data) {
   
-  
-  return "\n    scrivito_changed\n  ";
+  var stack1;
+  if (stack1 = helpers.tooltip) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.tooltip; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  return escapeExpression(stack1);
   }
 
 function program5(depth0,data) {
   
-  
-  return "\n    scrivito_deleted\n  ";
+  var stack1;
+  if (stack1 = helpers.reason_for_being_disabled) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.reason_for_being_disabled; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  return escapeExpression(stack1);
   }
 
-function program7(depth0,data) {
+  buffer += "<li class=\"scrivito_menu_item scrivito_";
+  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + " ";
+  stack1 = helpers['if'].call(depth0, depth0.is_disabled, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\">\n  <span title=\"";
+  stack1 = helpers['if'].call(depth0, depth0.is_enabled, {hash:{},inverse:self.program(5, program5, data),fn:self.program(3, program3, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\">\n    <i class=\"scrivito_icon\">";
+  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "</i>";
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\n  </span>\n</li>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["menu_item"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["menu_item/spinner"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing;
+
+
+  buffer += "<li id=\"";
+  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\" class=\"scrivito_menu_item\">\n  <span>\n    <i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i>\n    ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_item.spinner.loading", options) : helperMissing.call(depth0, "translate", "menu_item.spinner.loading", options)))
+    + "\n  </span>\n</li>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["menu_item/spinner"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["obj_menu"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, stack2, functionType="function", escapeExpression=this.escapeExpression, self=this;
+
+function program1(depth0,data) {
+  
+  
+  return "\n    scrivito_new\n  ";
+  }
+
+function program3(depth0,data) {
+  
+  
+  return "\n    scrivito_changed\n  ";
+  }
+
+function program5(depth0,data) {
+  
+  
+  return "\n    scrivito_deleted\n  ";
+  }
+
+function program7(depth0,data) {
   
   
   return "\n    scrivito_conflict\n  ";
@@ -13636,146 +13737,189 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
-  this.ScrivitoHandlebarsTemplates["workspace_select_list"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.ScrivitoHandlebarsTemplates["workspace_select"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, self=this, functionType="function", escapeExpression=this.escapeExpression;
+  var buffer = "", stack1, stack2, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, functionType="function", self=this;
 
 function program1(depth0,data) {
   
-  var buffer = "", stack1, stack2;
-  buffer += "\n  ";
-  stack1 = helpers.unless.call(depth0, depth0.is_editable, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  var buffer = "", stack1;
+  buffer += "\n  <i class=\"scrivito_icon\">";
+  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n\n  <li class=\"scrivito_menu_item\">\n    <span>\n      <i class=\"scrivito_icon\" title=\""
-    + escapeExpression(((stack1 = depth0.long_title),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\">\n        ";
-  stack2 = helpers['if'].call(depth0, depth0.is_editable, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n      </i>\n      "
-    + escapeExpression(((stack1 = depth0.select_title),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\n      ";
-  stack2 = helpers['if'].call(depth0, depth0.is_current_workspace, {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n    </span>\n  </li>\n";
+  buffer += "</i>\n  <span class=\"scrivito_button_label\">";
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</span>\n  ";
+  stack1 = helpers['if'].call(depth0, depth0.is_outdated, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n";
   return buffer;
   }
 function program2(depth0,data) {
   
-  
-  return "\n    <li class=\"scrivito_menu_separator\"></li>\n  ";
+  var buffer = "", stack1, options;
+  buffer += "\n    <span class=\"scrivito_button_notice\">\n      <i class=\"scrivito_icon\">&#xf021;</i>\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "workspace_select.outdated", options) : helperMissing.call(depth0, "translate", "workspace_select.outdated", options)))
+    + "\n    </span>\n  ";
+  return buffer;
   }
 
 function program4(depth0,data) {
   
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n    <li class=\"scrivito_menu_separator\">\n      <span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "workspace_select.this_workspace", options) : helperMissing.call(depth0, "translate", "workspace_select.this_workspace", options)))
+    + "</span>\n    </li>\n    ";
+  stack2 = helpers.each.call(depth0, ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.for_editable), {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n    <li class=\"scrivito_menu_separator\"></li>\n  ";
+  return buffer;
+  }
+function program5(depth0,data) {
   
-  return "\n          &#xf011;\n        ";
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n      ";
+  options = {hash:{},data:data};
+  stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "workspace_select/menu_item", depth0, options) : helperMissing.call(depth0, "render", "workspace_select/menu_item", depth0, options));
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n    ";
+  return buffer;
   }
 
-function program6(depth0,data) {
+function program7(depth0,data) {
+  
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n    <li class=\"scrivito_menu_separator\"></li>\n    ";
+  options = {hash:{},data:data};
+  stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "workspace_select/menu_item", ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.select_published), options) : helperMissing.call(depth0, "render", "workspace_select/menu_item", ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.select_published), options));
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n  ";
+  return buffer;
+  }
+
+  stack1 = helpers['with'].call(depth0, depth0.selected_workspace, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n\n<ul class=\"scrivito_menu_box\" style=\"display:none\">\n  ";
+  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.selected_workspace),stack1 == null || stack1 === false ? stack1 : stack1.is_editable), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n\n  <li class=\"scrivito_menu_separator\">\n    <span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "workspace_select.other_workspaces", options) : helperMissing.call(depth0, "translate", "workspace_select.other_workspaces", options)))
+    + "</span>\n  </li>\n\n  ";
+  options = {hash:{},data:data};
+  stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "workspace_select/menu_item", ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.create_workspace), options) : helperMissing.call(depth0, "render", "workspace_select/menu_item", ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.create_workspace), options));
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n\n  <li class=\"scrivito_menu_item scrivito_workspace_list\">\n    <span>\n      <i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i>\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.loading_workspaces", options) : helperMissing.call(depth0, "translate", "menu_bar.loading_workspaces", options)))
+    + "\n    </span>\n  </li>\n\n  ";
+  stack2 = helpers.unless.call(depth0, ((stack1 = depth0.selected_workspace),stack1 == null || stack1 === false ? stack1 : stack1.is_published), {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n</ul>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["workspace_select"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["workspace_select/menu_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
+
+function program1(depth0,data) {
   
   
-  return "\n          &#xf064;\n        ";
+  return "scrivito_highlight";
   }
 
-function program8(depth0,data) {
+function program3(depth0,data) {
   
   
-  return "\n        <i class=\"scrivito_icon\" title=\"check\">&#61503;</i>\n      ";
+  return "scrivito_disabled";
   }
 
-  stack1 = helpers.each.call(depth0, depth0.workspaces, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+function program5(depth0,data) {
+  
+  var stack1;
+  if (stack1 = helpers.tooltip) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.tooltip; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  return escapeExpression(stack1);
+  }
+
+function program7(depth0,data) {
+  
+  var stack1;
+  if (stack1 = helpers.reason_for_being_disabled) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.reason_for_being_disabled; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  return escapeExpression(stack1);
+  }
+
+  buffer += "<li id=\"scrivito_";
+  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\" class=\"scrivito_menu_item\n    ";
+  stack1 = helpers['if'].call(depth0, depth0.is_action_required, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n";
+  buffer += "\n    ";
+  stack1 = helpers['if'].call(depth0, depth0.is_disabled, {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\">\n  <span title=\"";
+  stack1 = helpers['if'].call(depth0, depth0.is_enabled, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\">\n    <i class=\"scrivito_icon\">";
+  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "</i> ";
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\n  </span>\n</li>\n";
   return buffer;
   });
-  return this.ScrivitoHandlebarsTemplates["workspace_select_list"];
+  return this.ScrivitoHandlebarsTemplates["workspace_select/menu_item"];
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
-  this.ScrivitoHandlebarsTemplates["workspace_select_menu_bar_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.ScrivitoHandlebarsTemplates["workspace_select/other_workspaces"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, stack2, options, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this;
+  var buffer = "", stack1, stack2, helperMissing=helpers.helperMissing, self=this;
 
 function program1(depth0,data) {
   
+  
+  return "\n  <li class=\"scrivito_menu_separator\"></li>\n";
+  }
+
+function program3(depth0,data) {
+  
   var buffer = "", stack1, stack2, options;
-  buffer += "\n    <li class=\"scrivito_menu_separator\"></li>\n\n    <li id=\"scrivito_workspace_settings\" class=\"scrivito_menu_item\">\n      <span>\n        <i class=\"scrivito_icon\">";
-  stack2 = ((stack1 = ((stack1 = depth0.workspace_settings_command),stack1 == null || stack1 === false ? stack1 : stack1.icon)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "</i>\n        "
-    + escapeExpression(((stack1 = ((stack1 = depth0.workspace_settings_command),stack1 == null || stack1 === false ? stack1 : stack1.title)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\n      </span>\n    </li>\n\n    <li id=\"scrivito_changes_list_toggle\" class=\"scrivito_menu_item\">\n      <span>\n        <i class=\"scrivito_icon\" title=\"";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.menu_item", options) : helperMissing.call(depth0, "translate", "changes_list.menu_item", options)))
-    + "\">&#xf080;</i>\n        ";
+  buffer += "\n  ";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_list.menu_item", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "changes_list.menu_item", depth0.current_short_title, options)))
-    + "\n      </span>\n    </li>\n    <li class=\"scrivito_menu_item ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.publish_command),stack1 == null || stack1 === false ? stack1 : stack1.is_disabled), {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "workspace_select/menu_item", depth0, options) : helperMissing.call(depth0, "render", "workspace_select/menu_item", depth0, options));
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\">\n      <span id='"
-    + escapeExpression(((stack1 = ((stack1 = depth0.publish_command),stack1 == null || stack1 === false ? stack1 : stack1.id)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "' title='"
-    + escapeExpression(((stack1 = ((stack1 = depth0.publish_command),stack1 == null || stack1 === false ? stack1 : stack1.reason_for_being_disabled)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "'>\n        <i class=\"scrivito_icon\" title=\""
-    + escapeExpression(((stack1 = ((stack1 = depth0.publish_command),stack1 == null || stack1 === false ? stack1 : stack1.tooltip)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\">\n          ";
-  stack2 = ((stack1 = ((stack1 = depth0.publish_command),stack1 == null || stack1 === false ? stack1 : stack1.icon)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n        </i>\n        "
-    + escapeExpression(((stack1 = ((stack1 = depth0.publish_command),stack1 == null || stack1 === false ? stack1 : stack1.title)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\n      </span>\n    </li>\n    <li class=\"scrivito_menu_item\">\n      <span id='scrivito_rename_current_ws'>\n        <i class=\"scrivito_icon\"\n          title=\"";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.rename_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.rename_working_copy", depth0.current_short_title, options)))
-    + " \">&#61519;</i>\n        ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.rename_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.rename_working_copy", depth0.current_short_title, options)))
-    + "\n      </span>\n    </li>\n    <li class=\"scrivito_menu_item\">\n      <span id='scrivito_rebase_current_ws'>\n        <i class=\"scrivito_icon\"\n          title=\"";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.rebase_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.rebase_working_copy", depth0.current_short_title, options)))
-    + " \">\n          &#xf023;\n        </i>\n        ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.rebase_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.rebase_working_copy", depth0.current_short_title, options)))
-    + "\n      </span>\n    </li>\n    <li class=\"scrivito_menu_item\">\n      <span id='scrivito_delete_current_ws'>\n        <i class=\"scrivito_icon\"\n          title=\"";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.delete_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.delete_working_copy", depth0.current_short_title, options)))
-    + " \">&#61464;</i>\n        ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.delete_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.delete_working_copy", depth0.current_short_title, options)))
-    + "\n      </span>\n    </li>\n  ";
+  buffer += "\n";
   return buffer;
   }
-function program2(depth0,data) {
-  
-  
-  return "scrivito_disabled";
-  }
 
-  buffer += "<i class=\"scrivito_icon\">&#xf011;</i>\n<span class=\"scrivito_button_label\">";
-  if (stack1 = helpers.current_long_title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.current_long_title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</span>\n\n<ul class=\"scrivito_menu_box\" style=\"display: none;\">\n  <li class=\"scrivito_menu_item\">\n    <span id='scrivito_create_new_ws'>\n      <i class=\"scrivito_icon\" title=\"";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.create_new_working_copy", options) : helperMissing.call(depth0, "translate", "menu_bar.create_new_working_copy", options)))
-    + "\">&#61474;</i>\n      ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.create_new_working_copy", options) : helperMissing.call(depth0, "translate", "menu_bar.create_new_working_copy", options)))
-    + "\n    </span>\n  </li>\n  ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.current_workspace),stack1 == null || stack1 === false ? stack1 : stack1.is_editable), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  <li class=\"scrivito_menu_separator\"></li>\n  <li class=\"scrivito_menu_item\" id=\"scrivito_replace_with_real_ws\">\n    <span>\n      <i class=\"scrivito_icon scrivito_spinning\"\n        title=\"";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.loading_workspaces", options) : helperMissing.call(depth0, "translate", "menu_bar.loading_workspaces", options)))
-    + "\">&#61475;</i>\n      ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.loading_workspaces", options) : helperMissing.call(depth0, "translate", "menu_bar.loading_workspaces", options)))
-    + "\n    </span>\n  </li>\n</ul>\n";
+  buffer += "\n";
+  stack2 = helpers.each.call(depth0, depth0.commands, {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n";
   return buffer;
   });
-  return this.ScrivitoHandlebarsTemplates["workspace_select_menu_bar_item"];
+  return this.ScrivitoHandlebarsTemplates["workspace_select/other_workspaces"];
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
@@ -13825,11 +13969,20 @@ $.i18n().load({
   'obj.tooltip.has_conflict': 'Auf dieser Seite gab es parallele Änderungen, die mit den Änderungen in dieser Arbeitskopie zusammengeführt werden sollten.',
   'obj.tooltip.is_deleted': 'Diese Seite wurde gelöscht.',
 
+  'workspace.title_published': 'Veröffentlichte Inhalte',
+  'workspace.empty_title': '<leerer Titel>',
+
   'workspace_settings_dialog.owners': 'Besitzer',
   'workspace_settings_dialog.nothing_found': 'Nichts gefunden',
   'workspace_settings_dialog.searching': 'Suche...',
   'workspace_settings_dialog.too_short': 'Benutzer suchen...',
 
+  'workspace_select.outdated': 'veraltet',
+  'workspace_select.this_workspace': 'Diese Arbeitskopie',
+  'workspace_select.other_workspaces': 'Andere Arbeitskopien',
+
+  'menu_item.spinner.loading': 'Laden...',
+
   'choose_obj_class_dialog.add_child_page.title': 'Seitenvorlage auswählen',
   'choose_obj_class_dialog.add_widget.title': 'Widget auswählen',
 
@@ -13842,9 +13995,7 @@ $.i18n().load({
   'editable_ws_dialog.create_new_playholder': 'Titel der neuen Arbeitskopie',
   'editable_ws_dialog.select': 'Auswählen',
 
-  'details_dialog.title': '$1 bearbeiten',
-
-  'resource_dialog.title': 'Ressource',
+  'resource_dialog.title': 'Eigenschaften der Ressource "$1"',
 
   'resource_dialog.commands.revert_obj.title': 'Änderungen an Ressource verwerfen',
   'resource_dialog.commands.revert_obj.rtc_workspace': 'Diese Ressource ist Teil der "rtc"-Arbeitskopie, bei der Änderungen nicht verworfen werden können.',
@@ -13862,26 +14013,10 @@ $.i18n().load({
   'resource_dialog.commands.delete_obj.dialog.title': 'Wirklich diese Ressource löschen?',
   'resource_dialog.commands.delete_obj.dialog.description': 'Änderungen an einer gelöschten Ressource können nicht wiederhergestellt werden.',
 
-  'menu_bar.working_copy': 'Arbeitskopie',
-  'menu_bar.empty_workspace_title': '<leerer Titel>',
-  'menu_bar.published_workspace_title': 'Veröffentlichte Inhalte',
   'menu_bar.loading_workspaces': 'Lade Arbeitskopien',
-  'menu_bar.select_working_copy': '"$1" auswählen',
-  'menu_bar.rebase_working_copy': '"$1" aktualisieren',
-  'menu_bar.rename_working_copy': '"$1" umbenennen',
-  'menu_bar.rename_working_copy_desc': 'Bitte geben Sie den neuen Titel der Arbeitskopie ein.',
-  'menu_bar.rename': 'Umbenennen',
-  'menu_bar.delete_working_copy': '"$1" löschen',
-  'menu_bar.delete_ws_confirmation': 'Wirklich "$1" löschen?',
-  'menu_bar.delete_ws_confirmation_desc': 'Eine gelöschte Arbeitskopie kann nicht wiederhergestellt werden.',
-  'menu_bar.delete': 'Löschen',
   'menu_bar.move': 'Verschieben',
   'menu_bar.copy': 'Kopieren',
   'menu_bar.create': 'Anlegen',
-  'menu_bar.create_new_working_copy': 'Arbeitskopie anlegen',
-  'menu_bar.create_new_ws_confirmation': 'Arbeitskopie anlegen',
-  'menu_bar.create_new_ws_confirmation_desc': 'Bitte geben Sie den Titel der neuen Arbeitskopie ein.',
-  'menu_bar.create_new_ws_confirmation_placeholder': 'Neuer Titel',
 
   'saving_indicator_item.saving': 'Wird gespeichert...',
   'saving_indicator_item.saved': 'Änderungen gespeichert',
@@ -13896,7 +14031,6 @@ $.i18n().load({
 
   'child_list_menu.description': 'Elemente von $1',
 
-  'changes_list.menu_item': 'Änderungen von "$1"',
   'changes_list.title': 'Änderungen von "$1"',
   'changes_list.empty_result': 'In dieser Arbeitskopie wurde nichts geändert.',
   'changes_list.more': 'Mehr...',
@@ -13906,9 +14040,33 @@ $.i18n().load({
   'changes_list.row.type': 'Typ',
   'changes_list.row.last_changed': 'Letzte Änderung',
 
-  'commands.workspace_settings.title': 'Einstellungen von "$1"',
+  'commands.create_workspace.title': 'Arbeitskopie anlegen',
+  'commands.create_workspace.dialog.title': 'Arbeitskopie anlegen',
+  'commands.create_workspace.dialog.description': 'Bitte geben Sie den Titel der neuen Arbeitskopie ein.',
+  'commands.create_workspace.dialog.placeholder': 'Neuer Titel',
+  'commands.create_workspace.dialog.accept': 'Anlegen',
+
+  'commands.rename_workspace.title': 'Umbenennen',
+  'commands.rename_workspace.dialog.title': '"$1" umbenennen',
+  'commands.rename_workspace.dialog.description': 'Bitte geben Sie den neuen Titel der Arbeitskopie ein.',
+  'commands.rename_workspace.dialog.accept': 'Umbenennen',
+
+  'commands.rebase_workspace.title': 'Aktualisieren',
+  'commands.rebase_workspace.tooltip': 'Arbeitskopie "$1" is veraltet. Bitte aktualisieren Sie sie.',
+  'commands.rebase_workspace.uptodate': 'Arbeitskopie "$1" muss nicht aktualisiert werden.',
+
+  'commands.delete_workspace.title': 'Löschen',
+  'commands.delete_workspace.dialog.title': 'Wirklich "$1" löschen?',
+  'commands.delete_workspace.dialog.description': 'Eine gelöschte Arbeitskopie kann nicht wiederhergestellt werden.',
+  'commands.delete_workspace.dialog.confirm': 'Löschen',
+
+  'commands.workspace_settings.title': 'Einstellungen bearbeiten',
+  'commands.workspace_settings.dialog.title': 'Einstellungen von "$1"',
+
+  'commands.workspace_changes.title': 'Änderungen anzeigen',
 
   'commands.obj_details.title': 'Seiteneigenschaften',
+  'commands.obj_details.dialog.title': 'Eigenschaften von "$1"',
 
   'commands.save_obj_to_clipboard.title': 'Seite zum Kopieren oder Verschieben markieren',
   'commands.save_obj_to_clipboard.has_children': 'Seiten mit Unterseiten können noch nicht verschoben oder kopiert werden.',
@@ -13930,6 +14088,13 @@ $.i18n().load({
   'commands.revert_obj.dialog.description': 'Verworfene Änderungen können nicht wiederhergestellt werden.',
   'commands.revert_obj.dialog.confirm': 'Verwerfen',
 
+  'commands.revert_widget.title': 'Änderungen am Widget verwerfen',
+  'commands.revert_widget.is_new': 'Dies ist ein neues Widget. Um die Erstellung dieses Widgets rückgängig zu machen, löschen Sie es bitte.',
+  'commands.revert_widget.is_not_modified': 'Dieses Widget wurde nicht geändert. Daher gibt es nichts zu verwerfen.',
+  'commands.revert_widget.dialog.title': 'Wirklich Änderungen an diesem Widget verwerfen?',
+  'commands.revert_widget.dialog.description': 'Verworfene Änderungen können nicht wiederhergestellt werden.',
+  'commands.revert_widget.dialog.confirm': 'Verwerfen',
+
   'commands.restore_obj.title': 'Seite wiederherstellen',
   'commands.restore_obj.rtc_workspace': 'Diese Seite ist Teil der "rtc"-Arbeitskopie, bei der gelöschte Seiten nicht wiederhergestellt werden können.',
 
@@ -13962,10 +14127,11 @@ $.i18n().load({
 
   'commands.widget_details.title': 'Widget-Eigenschaften',
   'commands.widget_details.no_details_view': 'Dieses Widget hat keine Eigenschaften',
+  'commands.widget_details.dialog.title': 'Eigenschaften von "$1"',
 
   'commands.save_widget_to_clipboard.title': 'Widget zum Kopieren markieren',
 
-  'commands.copy_widget_from_clipboard.title': 'Markiertes Widget hierher kopieren',
+  'commands.copy_widget_from_clipboard.title': 'Kopie des markierten Widgets anhängen',
   'commands.copy_widget_from_clipboard.paste_forbidden': 'Aufgrund ihres Typs kann das Widget hier nicht eingefügt werden. Nur Widgets der folgenden Typen können hierher verschoben oder kopiert werden: $1',
 
   'commands.delete_widget.title': 'Widget löschen',
@@ -13980,17 +14146,19 @@ $.i18n().load({
   'commands.switch_mode.deleted': 'Gelöscht',
   'commands.switch_mode.disabled': 'Aktuell ausgewählter Anzeigemodus',
 
-  'commands.publish_workspace.title': '"$1" veröffentlichen',
+  'commands.publish_workspace.title': 'Veröffentlichen',
   'commands.publish_workspace.permission_denied': 'Die Arbeitskopie kann aufgrund fehlender Benutzerrechte nicht veröffentlicht werden.',
   'commands.publish_workspace.dialog.confirm': 'Veröffentlichen',
   'commands.publish_workspace.dialog.title': '"$1" veröffentlichen?',
   'commands.publish_workspace.dialog.description': 'Eine Arbeitskopie zu veröffentlichen ist endgültig. Dieser Vorgang kann nicht rückgängig gemacht werden.',
   'commands.publish_workspace.error_dialog.title': 'Fehler beim Publizieren',
-  'commands.publish_workspace.error_dialog.description': 'Einige der geänderten CMS-Objekte können aufgrund fehlender Rechte nicht veröffentlicht werden.',
+  'commands.publish_workspace.error_dialog.description': 'Ihre Arbeitskopie konnte nicht veröffentlicht werden. Bitte entnehmen Sie die Details der Liste der Änderungen.',
   'commands.publish_workspace.error_dialog.confirm': 'Liste der Änderungen',
   'commands.publish_workspace.alert.invalid_certificates': 'Die Arbeitskopie konnte nicht veröffentlicht werden, weil mindestens ein Benutzer gerade Inhalte darin ändert.',
 
-  'ajax.timeout': 'Kommunikation mit dem CMS ist fehlgeschlagen. Bitte überprüfen Sie Ihre Netzwerkverbindung.',
+  'ajax.error': 'Die Kommunikation mit dem CMS ist aufgrund eines Fehlers fehlgeschlagen: $1',
+  'ajax.error.communication': 'Die Kommunikation mit dem CMS ist fehlgeschlagen. Bitte überprüfen Sie Ihre Netzwerkverbindung.',
+  'ajax.error.unknown': 'Die Kommunikation mit dem CMS ist aufgrund eines unbekannten Fehlers fehlgeschlagen.',
 
   'warn_before_unloading': 'Sie haben nicht gespeicherte Änderungen! Sind Sie sicher, dass sie schließen wollen?'
 }, 'de');
@@ -14012,11 +14180,20 @@ $.i18n().load({
   'obj.tooltip.has_conflict': 'To this page concurrent changes were made that should be merged with the changes in this working copy.',
   'obj.tooltip.is_deleted': 'This page has been deleted.',
 
+  'workspace.title_published': 'Published content',
+  'workspace.empty_title': '<empty title>',
+
   'workspace_settings_dialog.owners': 'Owners',
   'workspace_settings_dialog.nothing_found': 'Nothing found',
   'workspace_settings_dialog.searching': 'Searching...',
   'workspace_settings_dialog.too_short': 'Find user...',
 
+  'workspace_select.outdated': 'outdated',
+  'workspace_select.this_workspace': 'This working copy',
+  'workspace_select.other_workspaces': 'Other working copies',
+
+  'menu_item.spinner.loading': 'Loading...',
+
   'choose_obj_class_dialog.add_child_page.title': 'Select Page Type',
   'choose_obj_class_dialog.add_widget.title': 'Select Widget',
 
@@ -14029,9 +14206,7 @@ $.i18n().load({
   'editable_ws_dialog.create_new_playholder': 'new working copy title',
   'editable_ws_dialog.select': 'Select',
 
-  'details_dialog.title': 'Edit $1',
-
-  'resource_dialog.title': 'resource',
+  'resource_dialog.title': 'Properties of resource "$1"',
 
   'resource_dialog.commands.revert_obj.title': 'Discard changes to resource',
   'resource_dialog.commands.revert_obj.rtc_workspace': 'This resource is part of the "rtc" working copy, for which discarding changes is not supported.',
@@ -14049,26 +14224,10 @@ $.i18n().load({
   'resource_dialog.commands.delete_obj.dialog.title': 'Really delete this resource?',
   'resource_dialog.commands.delete_obj.dialog.description': 'Changes to a deleted resource cannot be restored.',
 
-  'menu_bar.working_copy': 'Working copy',
-  'menu_bar.empty_workspace_title': '<empty title>',
-  'menu_bar.published_workspace_title': 'Published content',
   'menu_bar.loading_workspaces': 'Loading working copies',
-  'menu_bar.select_working_copy': 'Select "$1"',
-  'menu_bar.rebase_working_copy': 'Update "$1"',
-  'menu_bar.rename_working_copy': 'Rename "$1"',
-  'menu_bar.rename_working_copy_desc': 'Please enter the new title of the working copy.',
-  'menu_bar.rename': 'Rename',
-  'menu_bar.delete_working_copy': 'Delete "$1"',
-  'menu_bar.delete_ws_confirmation': 'Really delete "$1"?',
-  'menu_bar.delete_ws_confirmation_desc': 'A deleted working copy cannot be restored.',
-  'menu_bar.delete': 'Delete',
   'menu_bar.create': 'Create',
   'menu_bar.move': 'Move',
   'menu_bar.copy': 'Copy',
-  'menu_bar.create_new_working_copy': 'Create working copy',
-  'menu_bar.create_new_ws_confirmation': 'Create a working copy',
-  'menu_bar.create_new_ws_confirmation_desc': 'Please enter the title of the new working copy.',
-  'menu_bar.create_new_ws_confirmation_placeholder': 'new title',
 
   'saving_indicator_item.saving': 'Saving...',
   'saving_indicator_item.saved': 'Changes saved',
@@ -14083,7 +14242,6 @@ $.i18n().load({
 
   'child_list_menu.description': 'Items of $1',
 
-  'changes_list.menu_item': 'Changes to "$1"',
   'changes_list.title': 'Changes to "$1"',
   'changes_list.empty_result': 'Nothing was changed in this working copy.',
   'changes_list.more': 'More...',
@@ -14093,9 +14251,33 @@ $.i18n().load({
   'changes_list.row.type': 'Type',
   'changes_list.row.last_changed': 'Last change',
 
-  'commands.workspace_settings.title': 'Settings for "$1"',
+  'commands.create_workspace.title': 'Create working copy',
+  'commands.create_workspace.dialog.title': 'Create working copy',
+  'commands.create_workspace.dialog.description': 'Please enter the title of the new working copy.',
+  'commands.create_workspace.dialog.placeholder': 'new title',
+  'commands.create_workspace.dialog.accept': 'Create',
+
+  'commands.rename_workspace.title': 'Rename',
+  'commands.rename_workspace.dialog.title': 'Rename "$1"',
+  'commands.rename_workspace.dialog.description': 'Please enter the new title of the working copy.',
+  'commands.rename_workspace.dialog.accept': 'Rename',
+
+  'commands.rebase_workspace.title': 'Update',
+  'commands.rebase_workspace.tooltip': 'Working copy "$1" is outdated. Please update it.',
+  'commands.rebase_workspace.uptodate': 'Working copy "$1" is up to date.',
+
+  'commands.delete_workspace.title': 'Delete',
+  'commands.delete_workspace.dialog.title': 'Really delete "$1"?',
+  'commands.delete_workspace.dialog.description': 'A deleted working copy cannot be restored.',
+  'commands.delete_workspace.dialog.confirm': 'Delete',
+
+  'commands.workspace_settings.title': 'Edit settings',
+  'commands.workspace_settings.dialog.title': 'Settings for "$1"',
+
+  'commands.workspace_changes.title': 'Show changes',
 
   'commands.obj_details.title': 'Page properties',
+  'commands.obj_details.dialog.title': 'Properties of "$1"',
 
   'commands.save_obj_to_clipboard.title': 'Mark page for copying or moving',
   'commands.save_obj_to_clipboard.has_children': 'Pages with subpages cannot be copied or moved yet.',
@@ -14117,6 +14299,13 @@ $.i18n().load({
   'commands.revert_obj.dialog.description': 'Discarded changes cannot be restored.',
   'commands.revert_obj.dialog.confirm': 'Discard',
 
+  'commands.revert_widget.title': 'Discard changes to widget',
+  'commands.revert_widget.is_new': 'This is a new widget. To discard the creation of this widget, please delete it.',
+  'commands.revert_widget.is_not_modified': 'This widget has not been modified. Therefore, nothing can be discarded.',
+  'commands.revert_widget.dialog.title': 'Really discard changes to this widget?',
+  'commands.revert_widget.dialog.description': 'Discarded changes cannot be restored.',
+  'commands.revert_widget.dialog.confirm': 'Discard',
+
   'commands.restore_obj.title': 'Restore page',
   'commands.restore_obj.rtc_workspace': 'This page is part of the "rtc" working copy, for which restoring pages is not supported.',
 
@@ -14149,10 +14338,11 @@ $.i18n().load({
 
   'commands.widget_details.title': 'Widget properties',
   'commands.widget_details.no_details_view': 'This widget has no properties',
+  'commands.widget_details.dialog.title': 'Properties of "$1"',
 
   'commands.save_widget_to_clipboard.title': 'Mark widget for copying',
 
-  'commands.copy_widget_from_clipboard.title': 'Copy marked widget here',
+  'commands.copy_widget_from_clipboard.title': 'Append copy of marked widget',
   'commands.copy_widget_from_clipboard.paste_forbidden': 'Due to its type, the widget cannot be moved or copied here. Only widgets of the following types can be inserted here: $1',
 
   'commands.delete_widget.title': 'Delete widget',
@@ -14167,23 +14357,106 @@ $.i18n().load({
   'commands.switch_mode.deleted': 'Deletions',
   'commands.switch_mode.disabled': 'Currently selected display mode',
 
-  'commands.publish_workspace.title': 'Publish "$1"',
+  'commands.publish_workspace.title': 'Publish',
   'commands.publish_workspace.permission_denied': 'The working copy can not be published due to missing user permissions.',
   'commands.publish_workspace.dialog.confirm': 'Publish',
   'commands.publish_workspace.dialog.title': 'Publish "$1"?',
   'commands.publish_workspace.dialog.description': 'Publishing a working copy is final. This action cannot be undone.',
   'commands.publish_workspace.error_dialog.title': 'Error while publishing',
-  'commands.publish_workspace.error_dialog.description': 'Some of the changed CMS objects can not be published due to missing permissions.',
+  'commands.publish_workspace.error_dialog.description': 'Your working copy could not be published. Please check the changes list for details.',
   'commands.publish_workspace.error_dialog.confirm': 'Open Changes List',
   'commands.publish_workspace.alert.invalid_certificates': 'The working copy could not be published because at least one user is currently modifying content in it.',
 
-  'ajax.timeout': 'Communication with the CMS failed. Please check your network connectivity.',
+  'ajax.error': 'Communication with the CMS failed with error: $1',
+  'ajax.error.communication': 'Communication with the CMS failed. Please check your network connectivity.',
+  'ajax.error.unknown': 'Communication with the CMS failed for unknown reasons.',
 
   'warn_before_unloading': 'You have unsaved changes. Are you sure you want to quit?',
 
   'test.two_arguments': '$1, $2',
   'test.four_arguments': '$1, $2, $3, $4'
 }, 'en');
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//
+
+//
+
+
+
+//
+
+
+
+//
+
+
+
+
+
+
+
+
+
+
+//
+
+
 /*global alert:false */
 
 
@@ -14305,20 +14578,6 @@ var scrivito = {};
       return "["+description+"]";
     },
 
-    add_enter_and_escape_action: function(enter_action, escape_action) {
-      var key_actions = {
-        13: enter_action,   // enter key
-        27: escape_action   // escape key
-      };
-
-      $(document).on('keyup.scrivito_enter_escape_action', function(e) {
-        if (key_actions[e.keyCode]) {
-          e.preventDefault();
-          key_actions[e.keyCode](e);
-        }
-      });
-    },
-
     remove_enter_and_escape_action: function() {
       $(document).off('keyup.scrivito_enter_escape_action');
     },
@@ -14346,30 +14605,19 @@ var scrivito = {};
       if (window.console) {
         window.console.warn(message);
       }
-    },
-
-    on: function(event, callback) {
-      if (event === 'editing') {
-        scrivito.deprecation_warning('scrivito.on("editing", ...)',
-            'scrivito.on("load", ...) && scrivito.in_editable_view()');
-        scrivito.gui.on('editing', function() {
-          if (scrivito.editing_context.visible_workspace.is_editable()) {
-            callback();
-          }
-        });
-      } else if (event === 'new_content') {
-        scrivito.deprecation_warning('scrivito.on("new_content", ...)',
-            'scrivito.on("content", ...)');
-        scrivito.gui.on('new_content', function(dom_element) {
-          callback(dom_element);
-        });
-      } else if (event === 'load') {
+    },
+
+    // @api public
+    on: function(event, callback) {
+      if (event === 'load') {
         scrivito.gui.on('open', function() {
           callback();
         });
 
         if (scrivito.gui.is_started()) {
-          callback();
+          scrivito.run_new_event(function() {
+            callback();
+          });
         }
       } else if (event === 'content') {
         scrivito.on('load', function() {
@@ -14384,12 +14632,14 @@ var scrivito = {};
       }
     },
 
+    // @api public
     create_obj: function(attributes) {
       return scrivito.obj.create(attributes).then(function(obj) {
         return {id: obj.id()};
       }, convert_internal_error);
     },
 
+    // @api public
     delete_obj: function(id) {
       if (id) {
         return scrivito.obj.create_instance({id: id}).destroy()
@@ -14399,6 +14649,7 @@ var scrivito = {};
       }
     },
 
+    // @api public
     is_current_page_restricted: function() {
       return !!scrivito.obj.current_page && scrivito.obj.current_page.has_restriction();
     },
@@ -14407,16 +14658,22 @@ var scrivito = {};
       return $.Deferred();
     },
 
+    // @api public
     trigger: function(event_name, dom_element) {
-      if (event_name === 'new_content') {
+      if (event_name === 'content') {
         _.each($(dom_element), function(e) {
           scrivito.gui.new_content(e);
         });
+      } else if (event_name === 'new_content') {
+        scrivito.deprecation_warning(
+          'scrivito.trigger("new_content")', 'scrivito.trigger("content")');
+        scrivito.trigger('content', dom_element);
       } else {
         $.error('Unknown event "' + event_name + '"');
       }
     },
 
+    // @api public
     in_editable_view: function() {
       return scrivito.editing_context.display_mode === 'editing' &&
           scrivito.editing_context.visible_workspace.is_editable();
@@ -14431,27 +14688,20 @@ var scrivito = {};
       return scrivito.bypass_throttle ? fn : _.throttle(fn, ms);
     },
 
-    // window.atob does not handle encoded UTF8 strings. See http://mzl.la/1p1zI9k.
-    base64_to_utf8: function(base64_string) {
-      return decodeURIComponent(window.escape(atob(base64_string)));
-    },
-
-    // window.btoa does not handle encoded UTF8 strings. See http://mzl.la/1p1zI9k.
-    utf8_to_base64: function(utf8_string) {
-      return btoa(window.unescape(encodeURIComponent(utf8_string)));
-    },
-
     json_parse_base64: function(base64_string) {
-      var utf8_string = scrivito.base64_to_utf8(base64_string);
-      // The server escapes non-unicode characters (e.g. '<') when encoding JSON.
-      utf8_string = utf8_string.replace(/\\u([\d\w]{4})/gi, function(match, grp) {
-        return String.fromCharCode(parseInt(grp, 16));
-      });
-      return JSON.parse(utf8_string);
+      // See http://mzl.la/1p1zI9k.
+      var dom_string = decodeURIComponent(window.escape(atob(base64_string)));
+      return JSON.parse(dom_string);
     },
 
     json_stringify_base64: function(object) {
-      return scrivito.utf8_to_base64(JSON.stringify(object));
+      var dom_string = JSON.stringify(object);
+      // See http://mzl.la/1p1zI9k.
+      return btoa(window.unescape(encodeURIComponent(dom_string)));
+    },
+
+    t: function() {
+      return scrivito.i18n.translate.apply(null, arguments);
     },
 
     init: function(config) {
@@ -14596,6 +14846,7 @@ var scrivito = {};
     };
   };
 
+  // @api public
   $.fn.scrivito = function(method, content) {
     switch (method) {
       case 'save':
@@ -14614,11 +14865,15 @@ var scrivito = {};
 
   // The callback has to be function that takes no arguments
   var log_exception_in_callback = function(event_name, callback) {
-    try {
+    if (scrivito.gui.sandbox_callbacks) {
+      try {
+        callback();
+      } catch(exception) {
+        var text = "'"+event_name+"' callback threw exception: ";
+        scrivito.log_error(text, exception);
+      }
+    } else {
       callback();
-    } catch(exception) {
-      var text = "'"+event_name+"' callback threw exception: ";
-      scrivito.log_error(text, exception);
     }
   };
 
@@ -14658,12 +14913,23 @@ var scrivito = {};
     }
   };
 
+  var assert_no_turbolinks = function() {
+    if (window.Turbolinks) {
+      scrivito.alert_dialog(
+        'You have Turbolinks enabled. ' +
+        'Scrivito does not yet support Turbolink. ' +
+        'Please remove it from your assets.'
+      );
+    }
+  };
+
   $.extend(scrivito, {
     gui: {
       start: function() {
         $('body').attr('data-scrivito-display-mode', scrivito.editing_context.display_mode);
         $('body').append('<div id="scrivito_editing"></div>');
         run_open_callbacks();
+        assert_no_turbolinks();
       },
 
       new_content: function(dom_element) {
@@ -14678,11 +14944,14 @@ var scrivito = {};
         callbacks[event_name].push(callback);
       },
 
-      // for testing purposes only
+      // For testing purpose only.
       reset_callbacks: function() {
         callbacks = {};
       },
 
+      // For testing purpose only.
+      sandbox_callbacks: true,
+
       is_started: function() {
         return !!$('body').attr('data-scrivito-display-mode');
       }
@@ -14797,7 +15066,10 @@ var scrivito = {};
       case 'success':
         return $.Deferred().resolve(task.result);
       case 'error':
-        return $.Deferred().reject(task.message);
+        return $.Deferred().reject({
+          message: task.message,
+          code: task.code
+        });
       case 'open':
         return scrivito.wait(2).then(function() {
           return single_ajax('GET', 'tasks/' + task.id).then(function(data) {
@@ -14824,14 +15096,21 @@ var scrivito = {};
         return $.Deferred().resolve(result);
       }, function(xhr, text_status, error) {
         var error_message;
+        var error_code;
         try {
-          error_message = JSON.parse(xhr.responseText).error;
+          var error_json = JSON.parse(xhr.responseText);
+          error_message = error_json.error;
+          error_code = error_json.code;
         } catch (SyntaxError) {}
 
         if (!error_message) {
           error_message = error;
         }
-        return $.Deferred().reject({status: xhr.status, message: error_message});
+        return $.Deferred().reject({
+          status: xhr.status,
+          message: error_message,
+          code: error_code
+        });
       }
     );
   };
@@ -14861,14 +15140,23 @@ var scrivito = {};
 
       return ajax_promise;
     },
+
     ajax: function(type, path, options) {
-      return scrivito.silent_ajax(type, path, options).fail(scrivito.alert_ajax_error);
+      return scrivito.silent_ajax(type, path, options).fail(function(error) {
+        scrivito.display_ajax_error(error);
+      });
     },
-    alert_ajax_error: function(error) {
-      if (error.message === 'timeout') {
-        scrivito.alert_dialog(scrivito.i18n.translate('ajax.timeout'));
+
+    display_ajax_error: function(error) {
+      var error_message = error.message;
+      if (_.contains(['abort', 'parsererror', 'timeout'], error_message)) {
+        scrivito.alert_dialog(scrivito.t('ajax.error.communication'));
+      } else if (error_message === 'error') {
+        scrivito.alert_dialog(scrivito.t('ajax.error.unknown'));
+      } else if (error_message) {
+        scrivito.alert_dialog(scrivito.t('ajax.error', error_message));
       } else {
-        scrivito.alert(error.message);
+        scrivito.alert_dialog(scrivito.t('ajax.error.unknown'));
       }
     }
   });
@@ -14914,6 +15202,11 @@ var scrivito = {};
             return !!that.reason_for_being_disabled();
           },
 
+          is_action_required: function() {
+            var is_action_required = params.action_required;
+            return typeof is_action_required === 'function' && is_action_required();
+          },
+
           reason_for_being_disabled: function() {
             var reason_for_being_disabled = params.disabled;
             if (typeof reason_for_being_disabled === 'function') {
@@ -14921,6 +15214,16 @@ var scrivito = {};
             }
           },
 
+          update: function() {
+            if (that.needs_update()) {
+              return params.update();
+            }
+          },
+
+          needs_update: function() {
+            return !!params.update;
+          },
+
           execute: function() {
             if (that.is_present() && that.is_enabled()) {
               params.execute();
@@ -14935,6 +15238,35 @@ var scrivito = {};
     }
   });
 }());
+(function() {
+  $.extend(scrivito, {
+    menu_item: {
+      create_instance: function(command) {
+        var render_menu_item = function() {
+          return scrivito.template.render('menu_item', command);
+        };
+
+        return {
+          render: function() {
+            if (command.is_present()) {
+              var view;
+              if (command.needs_update()) {
+                var id = _.uniqueId('scrivito_' + command.id());
+                view = scrivito.template.render('menu_item/spinner', {id: id});
+                command.update().then(function() {
+                  $('#' + id).replaceWith(render_menu_item());
+                });
+              } else {
+                view = render_menu_item();
+              }
+              return view;
+            }
+          }
+        };
+      }
+    }
+  });
+}());
 (function() {
   var callbacks = {};
   var current_token = 0;
@@ -15177,192 +15509,68 @@ var scrivito = {};
   });
 }());
 (function() {
-  var t = scrivito.i18n.translate;
-
-  var workspace_title_short =  function(workspace) {
-    if (workspace.is_editable()) {
-      if (workspace.title()) {
-        return workspace.title();
-      } else {
-        return t('menu_bar.empty_workspace_title');
-      }
-    } else {
-      return t('menu_bar.published_workspace_title');
-    }
-  };
-
-  var workspace_title_long = function(workspace) {
-    if (workspace.is_editable()) {
-      var title = t('menu_bar.working_copy') + ': ';
-      return title + workspace_title_short(workspace);
-    } else {
-      return workspace_title_short(workspace);
-    }
-  };
-
-  var workspace_title_select = function(workspace) {
-    var title = workspace_title_short(workspace);
-
-    return t('menu_bar.select_working_copy', title);
-  };
-
-  var renderer = function(view) {
-    var workspace = scrivito.editing_context.selected_workspace;
-
-    var select_menu_view = $(scrivito.template.render('workspace_select_menu_bar_item', {
-      current_workspace: workspace,
-      current_short_title: workspace_title_short(workspace),
-      current_long_title: workspace_title_long(workspace),
-      workspace_settings_command: workspace_settings_command(),
-      publish_command: scrivito.publish_workspace_command(workspace)
-    }));
-
-    view.find('#scrivito_select_workspace').append(select_menu_view);
-  };
-
-  var default_click_action = function(e) {
-    e.preventDefault();
-    e.stopPropagation();
-    scrivito.workspace_select.close_menu();
-  };
-
-  $(document).on("click.scrivito_toggle_ws_select", "#scrivito_select_workspace", function(e) {
-    default_click_action(e);
+  $.extend(scrivito, {
+    workspace_select: {
+      init: function() {
+        var selected_workspace = scrivito.editing_context.selected_workspace;
+        var commands = {
+          create_workspace: scrivito.create_workspace_command(),
+          select_published: scrivito.select_workspace_command(scrivito.workspace.published()),
+          for_editable: [
+            scrivito.workspace_settings_command(selected_workspace),
+            scrivito.workspace_changes_command(),
+            scrivito.rename_workspace_command(selected_workspace),
+            scrivito.rebase_workspace_command(selected_workspace),
+            scrivito.delete_workspace_command(selected_workspace),
+            scrivito.publish_workspace_command(selected_workspace)
+          ]
+        };
 
-    var replace_with_real_ws = $('#scrivito_select_workspace #scrivito_replace_with_real_ws');
-    if(replace_with_real_ws.length > 0) {
-      scrivito.workspace.all().done(function(workspaces) {
-        var workspaces_where_published_is_last = _.sortBy(workspaces, function(ws) {
-          return !ws.is_editable();
-        });
+        scrivito.menu_bar.register_item_renderer(function(menu_bar) {
+          var workspace_select = menu_bar.find('#scrivito_workspace_select');
+          workspace_select.append(scrivito.template.render('workspace_select', {
+            selected_workspace: selected_workspace,
+            commands: commands
+          }));
 
-        var handlebars_workspaces = _.map(workspaces_where_published_is_last, function(ws) {
-          return {
-            is_editable: ws.is_editable,
-            long_title: workspace_title_long(ws),
-            select_title: workspace_title_select(ws),
-            is_current_workspace: (ws.id() === scrivito.editing_context.selected_workspace.id())
+          var bind_command = function(command) {
+            workspace_select.on('click', '#scrivito_' + command.id(), function() {
+              return command.execute();
+            });
           };
-        });
 
-        var ws_list_view_html = scrivito.template.render('workspace_select_list', {
-          workspaces: handlebars_workspaces
-        });
-        var ws_list_view = $($.trim(ws_list_view_html));
-
-        _.each(ws_list_view.find('span'), function(dom_element, index) {
-          $(dom_element).on('click.scrivito_open_workspace', function(e) {
-            default_click_action(e);
-            scrivito.with_saving_overlay(
-              scrivito.redirect_to("?_scrivito_workspace_id=" +
-                  workspaces_where_published_is_last[index].id())
-            );
+          bind_command(commands.create_workspace);
+          bind_command(commands.select_published);
+          _.each(commands.for_editable, function(command) {
+            bind_command(command);
           });
-        });
-
-        replace_with_real_ws.replaceWith(ws_list_view);
-      });
-    }
-  });
-
-  $(document).on("click.scrivito_create_ws", "#scrivito_create_new_ws", function(e) {
-    default_click_action(e);
-    scrivito.prompt_dialog({
-      icon: '&#xf022;',
-      color: 'green',
-      title: t('menu_bar.create_new_ws_confirmation'),
-      description: t('menu_bar.create_new_ws_confirmation_desc'),
-      placeholder: t('menu_bar.create_new_ws_confirmation_placeholder'),
-      accept_button_text: t('menu_bar.create'),
-      accept_button_color: 'green'
-    }).done(function(title) {
-      scrivito.with_saving_overlay(
-        scrivito.workspace.create(title).then(function(new_workspace) {
-          var path = '?_scrivito_workspace_id=' + new_workspace.id();
-          if (!scrivito.editing_context.selected_workspace.is_editable()) {
-            path += '&_scrivito_display_mode=editing';
-          }
-          return scrivito.redirect_to(path);
-        })
-      );
-    });
-  });
-
-  var workspace_settings_command = function() {
-    return scrivito.workspace_settings_command(scrivito.editing_context.selected_workspace);
-  };
-
-  $(document).on('click.scrivito_workspace_settings', '#scrivito_workspace_settings', function() {
-    workspace_settings_command().execute();
-    return true;
-  });
-
-  $(document).on("click.scrivito_publish_ws", "#scrivito_publish_current_ws", function(e) {
-    scrivito.publish_workspace_command(scrivito.editing_context.selected_workspace).
-      execute();
-
-    return false;
-  });
-
-  $(document).on("click.scrivito_rename_ws", "#scrivito_rename_current_ws", function(e) {
-    default_click_action(e);
-    scrivito.prompt_dialog({
-      icon: '&#xf04f;',
-      color: 'green',
-      title: t('menu_bar.rename_working_copy', scrivito.editing_context.selected_workspace.title()),
-      description: t('menu_bar.rename_working_copy_desc'),
-      value: scrivito.editing_context.selected_workspace.title(),
-      accept_button_text: t('menu_bar.rename'),
-      accept_button_color: 'green'
-    }).done(function(new_title) {
-      scrivito.with_saving_overlay(
-        scrivito.editing_context.selected_workspace.rename(new_title).then(function() {
-          return scrivito.reload();
-        })
-      );
-    });
-  });
 
-  $(document).on("click.scrivito_rebase_ws", "#scrivito_rebase_current_ws", function(e) {
-    default_click_action(e);
-    scrivito.with_saving_overlay(
-      scrivito.editing_context.selected_workspace.rebase().then(function() {
-        return scrivito.reload();
-      })
-    );
-  });
+          workspace_select.on('click', function() {
+            var menu_box = workspace_select.find('.scrivito_menu_box');
+            menu_box.fadeToggle('50');
+
+            var workspace_list = menu_box.find('.scrivito_workspace_list');
+            if (workspace_list.find('.scrivito_spinning').length) {
+              scrivito.workspace.all_editable().then(function(workspaces) {
+                var commands = _(workspaces).reject(function(workspace) {
+                  return workspace.id() === selected_workspace.id();
+                }).map(function(workspace) {
+                  return scrivito.select_workspace_command(workspace);
+                });
 
-  $(document).on("click.scrivito_delete_ws", "#scrivito_delete_current_ws", function(e) {
-    default_click_action(e);
-    scrivito.confirmation_dialog({
-      color: 'red',
-      icon: '&#xf018;',
-      confirm_button_color: 'red',
-      confirm_button_text: t('menu_bar.delete'),
-      title: t('menu_bar.delete_ws_confirmation', workspace_title_short(
-        scrivito.editing_context.selected_workspace)),
-      description: t('menu_bar.delete_ws_confirmation_desc')
-    }).done(function() {
-      scrivito.with_saving_overlay(
-        scrivito.editing_context.selected_workspace.destroy().then(function(new_workspace) {
-          return scrivito.redirect_to('?_scrivito_workspace_id=published');
-        })
-      );
-    });
-  });
+                workspace_list.replaceWith(scrivito.template.render(
+                  'workspace_select/other_workspaces', {commands: commands}
+                ));
 
-  $(document).on('click', '#scrivito_changes_list_toggle', function(e) {
-    e.preventDefault();
-    scrivito.changes_dialog.open();
-  });
+                _.each(commands, function(command) {
+                  bind_command(command);
+                });
+              });
+            }
 
-  $.extend(scrivito, {
-    workspace_select: {
-      init: function() {
-        scrivito.menu_bar.register_item_renderer(renderer);
-      },
-      close_menu: function() {
-        $('#scrivito_select_workspace .scrivito_menu_box').fadeToggle('50');
+            return false;
+          });
+        });
       }
     }
   });
@@ -15614,6 +15822,8 @@ var scrivito = {};
     });
     form_data.append('file', file); // File must be appended last, otherwise S3 will complain.
 
+    permission.blob.filename = file.name;
+
     return $.ajax({type: 'POST', url: permission.url, data: form_data,
       // These are needed in order for jQuery to work properly with a FormData.
       contentType: false,
@@ -15794,7 +16004,7 @@ $(function() {
           },
           obj: function() {
             return scrivito.obj.create_instance({
-              id: that.dom_element().attr('data-scrivito-private-field-id'),
+              id: that.dom_element().attr('data-scrivito-private-field-obj-id'),
               obj_class_name: that.dom_element().attr('data-scrivito-field-obj-class')
             });
           },
@@ -15988,25 +16198,49 @@ $(function() {
     return string.length === 1 ? '0' + string : string;
   };
 
-  var prepare_attributes = function(data) {
-    var attributes = {};
-    _.each(data, function(value, field_name) {
+  var convert_attributes = function(data) {
+    var collected_promises = _.map(data, function(value, field_name) {
       if (value instanceof Date) {
-        value = format_date(value);
+        return $.Deferred().resolve([field_name, format_date(value)]);
+      } else if (value instanceof window.File) {
+        return scrivito.blob.create(value).then(function(value) {
+          return [field_name, value];
+        });
+      } else {
+        return $.Deferred().resolve([field_name, value]);
       }
-      attributes[field_name] = value;
     });
 
-    if (attributes.blob) {
-      return scrivito.blob.create(attributes.blob).then(function(blob_id) {
-        attributes.blob = blob_id;
-        return attributes;
+    return $.when.apply(this, collected_promises).then(function() {
+      return _.object(arguments);
+    });
+  };
+
+  var convert_widget_pool = function(widget_pool) {
+    if(widget_pool) {
+      var conversion_promises = _.map(widget_pool, function(attributes, widget_id) {
+        return convert_attributes(attributes).then(function(attributes) {
+          return [widget_id, attributes];
+        });
+      });
+
+      return $.when.apply(this, conversion_promises).then(function() {
+        return _.object(arguments);
       });
     } else {
-      return $.Deferred().resolve(attributes);
+      return $.Deferred().resolve(widget_pool);
     }
   };
 
+  var prepare_attributes = function(data) {
+    return convert_widget_pool(data._widget_pool).then(function(widget_pool) {
+      return convert_attributes(data).then(function(attributes) {
+        attributes._widget_pool = widget_pool;
+        return attributes;
+      });
+    });
+  };
+
   $.extend(scrivito, {
     obj: {
       init: function(config) {
@@ -16015,22 +16249,22 @@ $(function() {
         }
       },
 
-      create_instance: function(create_params) {
+      create_instance: function(params) {
         var that = {
           id: function() {
-            return create_params.id;
+            return params.id;
           },
 
           obj_class_name: function() {
-            return create_params.obj_class_name;
+            return params.obj_class_name;
           },
 
           description_for_editor: function() {
-            return create_params.description_for_editor;
+            return params.description_for_editor;
           },
 
           modification: function() {
-            return create_params.modification;
+            return params.modification;
           },
 
           is_new: function() {
@@ -16046,11 +16280,11 @@ $(function() {
           },
 
           has_children: function() {
-            return !!create_params.has_children;
+            return !!params.has_children;
           },
 
           has_conflict: function() {
-            return !!create_params.has_conflict;
+            return !!params.has_conflict;
           },
 
           has_restriction : function() {
@@ -16058,25 +16292,25 @@ $(function() {
           },
 
           restriction_messages: function() {
-            return create_params.restriction_messages || [];
+            return params.restriction_messages || [];
           },
 
           is_binary: function() {
-            return !!create_params.is_binary;
+            return !!params.is_binary;
           },
 
           has_details_view: function() {
-            return !!create_params.has_details_view;
+            return !!params.has_details_view;
           },
 
           tooltip: function() {
             if (editing_state()) {
-              return scrivito.i18n.translate('obj.tooltip.' + editing_state());
+              return scrivito.t('obj.tooltip.' + editing_state());
             }
           },
 
           last_changed: function() {
-            return create_params.last_changed;
+            return params.last_changed;
           },
 
           save: function(data) {
@@ -16098,6 +16332,15 @@ $(function() {
             return scrivito.ajax('PUT', 'objs/' + that.id() + '/revert');
           },
 
+          revert_widget: function(widget_id) {
+            return scrivito.ajax('PUT',
+                'objs/' + that.id() + '/revert_widget?widget_id=' + widget_id);
+          },
+
+          update_widget_modification: function(widget_id) {
+            return scrivito.ajax('GET', 'objs/' + that.id() + '/widget_modification?widget_id=' + widget_id);
+          },
+
           restore: function() {
             return scrivito.ajax('PUT', 'objs/' + that.id() + '/restore');
           },
@@ -16125,6 +16368,12 @@ $(function() {
             return scrivito.ajax('POST', 'objs/'+that.id()+'/duplicate').then(function(new_data) {
               return scrivito.obj.create_instance_from_server_data(new_data);
             });
+          },
+
+          update_modification: function() {
+            return scrivito.ajax('GET', 'objs/' + that.id() + '/modification').then(function(data) {
+              params.modification = data.modification;
+            });
           }
         };
 
@@ -16149,10 +16398,10 @@ $(function() {
         return that;
       },
 
-      create_instance_from_server_data: function(create_params) {
+      create_instance_from_server_data: function(params) {
         return scrivito.obj.create_instance({
-          id: (create_params.id || create_params._id),
-          obj_class_name: create_params._obj_class
+          id: (params.id || params._id),
+          obj_class_name: params._obj_class
         });
       },
 
@@ -16204,7 +16453,6 @@ $(function() {
   $.extend(scrivito, {
     chainable_search: {
       create_instance: function(build_query) {
-        // Private
         var query = build_query || { predicates: [] };
 
         var add_predicate = function(field, operator, value, boost, negate) {
@@ -16231,32 +16479,37 @@ $(function() {
               $.param({query: JSON.stringify(query), query_action: action}));
         };
 
-        // Public
         var that = {
+          // @api public
           query: function() {
             return query;
           },
 
+          // @api public
           and: function(field, operator, value, boost) {
             add_predicate(field, operator, value, boost);
             return that;
           },
 
+          // @api public
           and_not: function(field, operator, value) {
             add_predicate(field, operator, value, undefined, true);
             return that;
           },
 
+          // @api public
           offset: function(offset) {
             query.offset = offset;
             return that;
           },
 
+          // @api public
           order: function(order) {
             query.order = order;
             return that;
           },
 
+          // @api public
           reverse_order: function() {
             if (query.reverse_order) {
               delete query.reverse_order;
@@ -16266,21 +16519,25 @@ $(function() {
             return that;
           },
 
+          // @api public
           batch_size: function(batch_size) {
             query.batch_size = batch_size;
             return that;
           },
 
+          // @api public
           format: function(name) {
             query.format = name;
             return that;
           },
 
+          // @api public
           include_deleted: function() {
             query.include_deleted = true;
             return that;
           },
 
+          // @api public
           load_batch: function() {
             var offset = query.offset || 0;
             var next;
@@ -16301,12 +16558,14 @@ $(function() {
             });
           },
 
+          // @api public
           size: function() {
             return execute_search(query, 'size').then(function(result) {
               return $.Deferred().resolve(result.total);
             });
           },
 
+          // @api public
           clone: function() {
             var cloned_query = $.extend(true, {}, query);
             return scrivito.chainable_search.create_instance(cloned_query);
@@ -16324,6 +16583,7 @@ $(function() {
 
 (function() {
   $.extend(scrivito, {
+    // @api public
     obj_where: function(field, operator, value, boost) {
       return scrivito.chainable_search.create_instance().and(field, operator, value, boost);
     }
@@ -16427,8 +16687,8 @@ $(function() {
             return options.modification;
           },
 
-          container_modification: function() {
-            return options.container_modification;
+          placement_modification: function() {
+            return options.placement_modification;
           },
 
           description_for_editor: function() {
@@ -16436,7 +16696,23 @@ $(function() {
           },
 
           is_modified: function() {
-            return !!(that.modification() || that.container_modification());
+            return !!that.modification();
+          },
+
+          is_new: function() {
+            return that.modification() === 'new';
+          },
+
+          is_edited: function() {
+            return that.modification() === 'edited';
+          },
+
+          is_deleted: function() {
+            return that.modification() === 'deleted';
+          },
+
+          is_placement_modified: function() {
+            return !!that.placement_modification();
           },
 
           save: function(widget_attributes) {
@@ -16458,11 +16734,23 @@ $(function() {
             return that.fetch_markup('show_widget');
           },
 
+          revert: function() {
+            return that.obj().revert_widget(that.id()).then(function() {
+              options.modification = null;
+            });
+          },
+
           fetch_markup: function(action_name) {
             var obj_id = that.obj().id();
             var widget_id = that.id();
             var url = 'render_widget/' + obj_id + '/' + action_name + '/' + widget_id;
             return scrivito.ajax('GET', url, {dataType: 'html'});
+          },
+
+          update_modification: function() {
+            return that.obj().update_widget_modification(that.id()).then(function(data) {
+              options.modification = data.modification;
+            });
           }
         };
 
@@ -16492,8 +16780,8 @@ $(function() {
                 dom_element.attr('data-scrivito-widget-obj-class'),
                 {
                   modification: dom_element.attr('data-scrivito-private-widget-modification'),
-                  container_modification: dom_element.attr(
-                      'data-scrivito-private-widget-container-modification'),
+                  placement_modification: dom_element.attr(
+                      'data-scrivito-private-widget-placement-modification'),
                   description_for_editor: dom_element.attr(
                       'data-scrivito-private-widget-description-for-editor')
                 }
@@ -16560,6 +16848,13 @@ $(function() {
               return that.widget_elements().length === 0;
             },
 
+            parent_widget: function() {
+              var widgets = that.dom_element().parents('[data-scrivito-private-widget-id]');
+              if (widgets.length) {
+                return scrivito.cms_element.from_dom_element(widgets.eq(0)).widget();
+              }
+            },
+
             create_widget: function(widget_class, widget_element) {
               var widget_spec = {create: {_obj_class: widget_class}};
               return add_widget(widget_spec, widget_element);
@@ -16571,8 +16866,13 @@ $(function() {
             },
 
             fetch_widget_class_selection: function() {
+              var params = {field_name: that.field_name()};
+              var parent_widget = that.parent_widget();
+              if (parent_widget) {
+                params.widget_id = parent_widget.id();
+              }
               return scrivito.ajax('GET', 'objs/' + that.obj().id() + '/widget_class_selection?' +
-                  $.param({field_name: that.field_name()}));
+                  $.param(params));
             },
 
             allowed_classes: function() {
@@ -16641,60 +16941,37 @@ $(function() {
   $.extend(scrivito, {
     workspace: {
       from_data: function(data) {
-        var get_check = function(offset) {
-          return scrivito.ajax('GET', 'workspaces/' + that.id() + '/check?from='+offset);
-        };
-
-        var check_result = function(result, certificates) {
-          if (result.result === 'fail') {
-            return $.Deferred().resolve(false);
-          }
-
-          certificates.push(result.certificate);
-
-          if (result.pass.until === 'END') {
-            return $.Deferred().resolve(certificates);
-          } else {
-            var offset = parseInt(result.pass.until, 10) + 1;
-
-            return get_check(offset).then(function(result) {
-              return check_result(result, certificates);
-            });
-          }
-        };
-
-        var check_and_publish_with_retry = function(workspace, retry_number) {
-          return workspace.check().then(function(certificates) {
-            if (certificates) {
-              return workspace.publish(certificates).then(null, function(error) {
-                if (error.status === 409) {
-                  if (retry_number < 2) {
-                    return check_and_publish_with_retry(workspace, retry_number + 1);
-                  } else {
-                    return $.Deferred().reject({type: 'outdated_certificates'});
-                  }
-                } else {
-                  scrivito.alert_ajax_error(error);
-                  return error;
-                }
-              });
-            } else {
-              return $.Deferred().reject({type: 'check_failed'});
-            }
-          });
-        };
-
         var that = {
           id: function() {
             return data.id;
           },
 
           title: function() {
+            return that.original_title() || default_title();
+          },
+
+          original_title: function() {
             return data.title;
           },
 
+          icon: function() {
+            return that.is_published() ? '&#xf064;' : '&#xf011;';
+          },
+
+          is_published: function() {
+            return that.id() === 'published';
+          },
+
+          is_outdated: function() {
+            return !!data.outdated;
+          },
+
+          mark_as_outdated: function() {
+            data.outdated = true;
+          },
+
           is_editable: function() {
-            return that.id() !== 'published';
+            return !that.is_published();
           },
 
           is_rtc: function() {
@@ -16702,13 +16979,13 @@ $(function() {
           },
 
           check: function() {
-            return get_check(0).then(function(result) {
-              return check_result(result, []);
+            return check(0).then(function(result) {
+              return handle_check_result(result, []);
             });
           },
 
           check_and_publish: function() {
-            return check_and_publish_with_retry(that, 0);
+            return check_and_publish(0);
           },
 
           publish: function(certificates) {
@@ -16716,25 +16993,95 @@ $(function() {
                 {data: { certificates: certificates }});
           },
 
-          rebase: function() {
-            return scrivito.ajax('PUT', 'workspaces/' + that.id() + '/rebase');
-          },
+          rebase: function() {
+            return scrivito.ajax('PUT', 'workspaces/' + that.id() + '/rebase').done(function() {
+              data.outdated = false;
+            });
+          },
+
+          update: function(attributes) {
+            return scrivito.ajax('PUT', 'workspaces/' + that.id(), {data: {workspace: attributes}});
+          },
+
+          rename: function(new_title) {
+            return that.update({title: new_title});
+          },
+
+          destroy: function() {
+            return scrivito.ajax('DELETE', 'workspaces/' + that.id());
+          },
+
+          fetch_memberships: function() {
+            return scrivito.ajax('GET', 'workspaces/' + that.id()).then(function(details) {
+              return details.memberships;
+            });
+          }
+        };
+
+        var check_and_publish = function(number_of_retries) {
+          return rebase_outdated().then(function() {
+            return that.check().then(function(certificates) {
+              if (certificates) {
+                return that.publish(certificates).then(null, function(error) {
+                  return handle_check_and_publish_error(error, number_of_retries);
+                });
+              } else {
+                return $.Deferred().reject({type: 'check_failed'});
+              }
+            }, function(error) {
+              return handle_check_and_publish_error(error, number_of_retries);
+            });
+          });
+        };
+
+        var rebase_outdated = function() {
+          return that.is_outdated() ? that.rebase() : $.Deferred().resolve();
+        };
+
+        var check = function(offset) {
+          return scrivito.silent_ajax('GET', 'workspaces/' + that.id() + '/check?from=' + offset);
+        };
+
+        var handle_check_result = function(result, certificates) {
+          if (result.result === 'fail') {
+            return $.Deferred().resolve(false);
+          }
+
+          certificates.push(result.certificate);
 
-          update: function(attributes) {
-            return scrivito.ajax('PUT', 'workspaces/' + that.id(), {data: {workspace: attributes}});
-          },
+          if (result.pass.until === 'END') {
+            return $.Deferred().resolve(certificates);
+          } else {
+            var offset = parseInt(result.pass.until, 10) + 1;
+            return check(offset).then(function(result) {
+              return handle_check_result(result, certificates);
+            });
+          }
+        };
 
-          rename: function(new_title) {
-            return that.update({title: new_title});
-          },
-          destroy: function() {
-            return scrivito.ajax('DELETE', 'workspaces/' + that.id());
-          },
+        var handle_check_and_publish_error = function(error, number_of_retries) {
+          if (error.code === 'precondition_not_verifiable.workspace.publish.content_state_id') {
+            // Another workspace has been published since last check.
+            that.mark_as_outdated();
+            return check_and_publish(number_of_retries);
+          } else if (error.code === 'precondition_not_met.workspace.publish.content_state_id') {
+            // The workspace has been changed since last check.
+            if (number_of_retries === 2) {
+              return $.Deferred().reject({type: 'outdated_certificates'});
+            } else {
+              return check_and_publish(number_of_retries + 1);
+            }
+          } else {
+            scrivito.display_ajax_error(error);
+            return error;
+          }
+        };
 
-          fetch_memberships: function() {
-            return scrivito.ajax('GET', 'workspaces/' + that.id()).then(function(details) {
-              return details.memberships;
-            });
+        var default_title = function() {
+          if (that.is_published()) {
+            return scrivito.t('workspace.title_published');
+          } else {
+            return scrivito.t('workspace.empty_title');
           }
         };
 
@@ -16746,7 +17093,7 @@ $(function() {
           return _.sortBy(_.map(workspace_datas, function(workspace_data) {
             return scrivito.workspace.from_data(workspace_data);
           }, function(workspace) {
-            return (workspace.title() || '').toUpperCase();
+           return workspace.is_published() ? '' : workspace.title().toUpperCase();
           }));
         });
       },
@@ -16759,6 +17106,10 @@ $(function() {
         });
       },
 
+      published: function() {
+        return scrivito.workspace.from_data({id: 'published'});
+      },
+
       create: function(title) {
         return scrivito.ajax('POST', 'workspaces', {data: {workspace: {title: title}}}).
             then(function(ws_data) {
@@ -16937,9 +17288,11 @@ $(function() {
 
 (function() {
   Handlebars.registerHelper('translate', scrivito.i18n.translate);
+
   Handlebars.registerHelper('localize_date', function(date_value_function) {
     return scrivito.i18n.localize_date(date_value_function());
   });
+
   Handlebars.registerHelper('localize_date_relative', function(date_value_function) {
     return scrivito.i18n.localize_date_relative(date_value_function());
   });
@@ -16952,6 +17305,10 @@ $(function() {
     return new Handlebars.SafeString(escaped_array.join('&#13;'));
   });
 
+  Handlebars.registerHelper('render', function(template_path, object) {
+    return new Handlebars.SafeString(scrivito.template.render(template_path, object));
+  });
+
   $.extend(scrivito, {
     template: {
       load_templates_from_server: false,
@@ -17122,7 +17479,7 @@ $(function() {
         var dom_element_position = dom_element.position();
         var view = $(scrivito.template.render('element_overlay')).css({
           position: 'absolute', // Required for unit tests to pass without an extra CSS file.
-          top:    dom_element_position.top,
+          top:    0,
           left:   dom_element_position.left,
           width:  dom_element.width(),
           height: dom_element.height()
@@ -17172,8 +17529,8 @@ $(function() {
     open: function(options) {
       var view = $(scrivito.template.render('confirmation_dialog', $.extend({
         icon: '&#xf01d;',
-        cancel_button_text: scrivito.i18n.translate('cancel'),
-        confirm_button_text: scrivito.i18n.translate('confirm')
+        cancel_button_text: scrivito.t('cancel'),
+        confirm_button_text: scrivito.t('confirm')
       }, options || {})));
 
       $('#scrivito_editing').append(view);
@@ -17216,8 +17573,8 @@ $(function() {
     open: function(options) {
       var view = $(scrivito.template.render('prompt_dialog', $.extend({
         icon: '&#61468;',
-        accept_button_text: scrivito.i18n.translate('accept'),
-        cancel_button_text: scrivito.i18n.translate('cancel')
+        accept_button_text: scrivito.t('accept'),
+        cancel_button_text: scrivito.t('cancel')
       }, options || {})));
 
       $('#scrivito_editing').append(view);
@@ -17320,8 +17677,8 @@ $(function() {
       var deferred = $.Deferred();
 
       var view = $(scrivito.template.render('choose_obj_class_dialog', {
-        title: scrivito.i18n.translate('choose_obj_class_dialog.' + locale_path + '.title'),
-        description: scrivito.i18n.translate('choose_obj_class_dialog.' + locale_path + '.description')
+        title: scrivito.t('choose_obj_class_dialog.' + locale_path + '.title'),
+        description: scrivito.t('choose_obj_class_dialog.' + locale_path + '.description')
       }));
 
       obj_classes_deferred.done(function(obj_class_selection) {
@@ -17434,7 +17791,12 @@ $(function() {
       open: function(dom_element, commands) {
         scrivito.close_all_menus();
 
-        var menu = $(scrivito.template.render('menu', {commands: commands}));
+        var menu = $(scrivito.template.render('menu', {
+          menu_items: _.map(commands, function(command) {
+            return scrivito.menu_item.create_instance(command);
+          })
+        }));
+
         dom_element.data('scrivito-private-menu', menu);
 
         menu.data('scrivito-menu-close', function() {
@@ -17449,7 +17811,7 @@ $(function() {
         });
 
         _.each(commands, function(command) {
-          menu.find('.scrivito_' + command.id()).on('click', function() {
+          menu.on('click', '.scrivito_' + command.id(), function() {
             if (command.is_enabled()) {
               menu.data('scrivito-menu-close')();
             }
@@ -17508,7 +17870,11 @@ $(window).on('load', function() {
   var open = function(dom_element, commands, align) {
     scrivito.close_all_menus();
 
-    var menu = $(scrivito.template.render('menu', {commands: commands, align: align}));
+    var menu = $(scrivito.template.render('menu', {align: align,
+      menu_items: _.map(commands, function(command) {
+        return scrivito.menu_item.create_instance(command);
+      })
+    }));
 
     menu.data('scrivito-menu-close', function() {
       menu.find('.scrivito_menu_box').fadeOut(500, function() {
@@ -17517,7 +17883,7 @@ $(window).on('load', function() {
     });
 
     _.each(commands, function(command) {
-      menu.find('.scrivito_menu_item.scrivito_' + command.id()).on('click', function() {
+      menu.on('click', '.scrivito_' + command.id(), function() {
         if (command.is_enabled()) {
           menu.data('scrivito-menu-close')();
         }
@@ -17618,8 +17984,7 @@ $(window).on('load', function() {
 
       open: function(obj) {
         return scrivito.details_dialog.open({
-          title: scrivito.i18n.translate('resource_dialog.title'),
-          icon: '&#xf03d;',
+          title: scrivito.t('resource_dialog.title', obj.obj_class_name()),
           fetch_markup: function() {
             return obj.fetch_details_markup();
           },
@@ -17640,9 +18005,9 @@ $(window).on('load', function() {
     add_subpage_command: function(child_list_element) {
       return scrivito.command.create_instance({
         id: 'add_subpage',
-        title: scrivito.i18n.translate('commands.add_subpage.title'),
+        title: scrivito.t('commands.add_subpage.title'),
         icon: '&#xf022;',
-        tooltip: scrivito.i18n.translate('commands.add_subpage.tooltip',
+        tooltip: scrivito.t('commands.add_subpage.tooltip',
             child_list_element.obj().description_for_editor()),
 
         execute: function() {
@@ -17666,7 +18031,7 @@ $(window).on('load', function() {
     add_widget_command: function(widget_field_element, widget_element) {
       return scrivito.command.create_instance({
         id: 'add_widget',
-        title: scrivito.i18n.translate('commands.add_widget.title'),
+        title: scrivito.t('commands.add_widget.title'),
         icon: '&#xf022;',
 
         present: function() {
@@ -17703,7 +18068,7 @@ $(window).on('load', function() {
     copy_page_from_clipboard_command: function(child_list_element) {
       return scrivito.command.create_instance({
         id: 'copy_page_from_clipboard',
-        title: scrivito.i18n.translate('commands.copy_page_from_clipboard.title'),
+        title: scrivito.t('commands.copy_page_from_clipboard.title'),
         icon: '&#xf015;',
 
         present: function() {
@@ -17713,7 +18078,7 @@ $(window).on('load', function() {
         disabled: function() {
           var obj_class_name = scrivito.obj_clipboard.obj().obj_class_name();
           if (!child_list_element.is_valid_child_class(obj_class_name)) {
-            return scrivito.i18n.translate('commands.copy_page_from_clipboard.paste_forbidden',
+            return scrivito.t('commands.copy_page_from_clipboard.paste_forbidden',
                 child_list_element.allowed_classes().join(', '));
           }
         },
@@ -17734,7 +18099,7 @@ $(window).on('load', function() {
     copy_widget_from_clipboard_command: function(widget_field_element, widget_element) {
       return scrivito.command.create_instance({
         id: 'copy_widget_from_clipboard',
-        title: scrivito.i18n.translate('commands.copy_widget_from_clipboard.title'),
+        title: scrivito.t('commands.copy_widget_from_clipboard.title'),
         icon: '&#xf015;',
 
         present: function() {
@@ -17751,7 +18116,7 @@ $(window).on('load', function() {
         disabled: function() {
           var widget_class_name = scrivito.widget_clipboard.widget().widget_class_name();
           if (!widget_field_element.is_valid_child_class(widget_class_name)) {
-            return scrivito.i18n.translate('commands.copy_widget_from_clipboard.paste_forbidden',
+            return scrivito.t('commands.copy_widget_from_clipboard.paste_forbidden',
                 widget_field_element.allowed_classes().join(', '));
           }
         },
@@ -17776,6 +18141,37 @@ $(window).on('load', function() {
     }
   });
 }());
+(function() {
+  $.extend(scrivito, {
+    create_workspace_command: function() {
+      return scrivito.command.create_instance({
+        id: 'create_workspace',
+        title: scrivito.t('commands.create_workspace.title'),
+        icon: '&#xf022;',
+
+        execute: function() {
+          scrivito.prompt_dialog({
+            title: scrivito.t('commands.create_workspace.dialog.title'),
+            description: scrivito.t('commands.create_workspace.dialog.description'),
+            placeholder: scrivito.t('commands.create_workspace.dialog.placeholder'),
+            icon: '&#xf022;',
+            color: 'green',
+            accept_button_text: scrivito.t('commands.create_workspace.dialog.accept'),
+            accept_button_color: 'green'
+          }).then(function(title) {
+            scrivito.with_saving_overlay(scrivito.workspace.create(title).then(function(workspace) {
+              var path = '?_scrivito_workspace_id=' + workspace.id();
+              if (!scrivito.editing_context.selected_workspace.is_editable()) {
+                path += '&_scrivito_display_mode=editing';
+              }
+              return scrivito.redirect_to(path);
+            }));
+          });
+        }
+      });
+    }
+  });
+}());
 (function() {
   $.extend(scrivito, {
     delete_obj_command: function(obj, translations_namespace) {
@@ -17785,7 +18181,7 @@ $(window).on('load', function() {
 
       return scrivito.command.create_instance({
         id: 'delete_obj',
-        title: scrivito.i18n.translate(translations_namespace + '.title'),
+        title: scrivito.t(translations_namespace + '.title'),
         icon: '&#xf018;',
 
         present: function() {
@@ -17794,20 +18190,20 @@ $(window).on('load', function() {
 
         disabled: function() {
           if (!scrivito.editing_context.selected_workspace.is_editable()) {
-            return scrivito.i18n.translate('commands.delete_obj.published_workspace');
+            return scrivito.t('commands.delete_obj.published_workspace');
           }
           if (obj.has_children()) {
-            return scrivito.i18n.translate('commands.delete_obj.has_children');
+            return scrivito.t('commands.delete_obj.has_children');
           }
         },
 
         execute: function() {
           return scrivito.confirmation_dialog({
-            title: scrivito.i18n.translate(translations_namespace + '.dialog.title'),
-            description: scrivito.i18n.translate(translations_namespace + '.dialog.description'),
+            title: scrivito.t(translations_namespace + '.dialog.title'),
+            description: scrivito.t(translations_namespace + '.dialog.description'),
             icon: '&#xf018;',
             color: 'red',
-            confirm_button_text: scrivito.i18n.translate('commands.delete_obj.dialog.confirm'),
+            confirm_button_text: scrivito.t('commands.delete_obj.dialog.confirm'),
             confirm_button_color: 'red'
           }).then(function() {
             return scrivito.with_saving_overlay(obj.destroy().then(function() {
@@ -17828,7 +18224,7 @@ $(window).on('load', function() {
     delete_widget_command: function(widget_field_element, widget_element) {
       return scrivito.command.create_instance({
         id: 'delete_widget',
-        title: scrivito.i18n.translate('commands.delete_widget.title'),
+        title: scrivito.t('commands.delete_widget.title'),
         icon: '&#xf018;',
 
         present: function() {
@@ -17837,11 +18233,11 @@ $(window).on('load', function() {
 
         execute: function() {
           return scrivito.confirmation_dialog({
-            title: scrivito.i18n.translate('commands.delete_widget.dialog.title'),
-            description: scrivito.i18n.translate('commands.delete_widget.dialog.description'),
+            title: scrivito.t('commands.delete_widget.dialog.title'),
+            description: scrivito.t('commands.delete_widget.dialog.description'),
             icon: '&#xf018;',
             color: 'red',
-            confirm_button_text: scrivito.i18n.translate('commands.delete_widget.dialog.confirm'),
+            confirm_button_text: scrivito.t('commands.delete_widget.dialog.confirm'),
             confirm_button_color: 'red'
           }).then(function() {
             var widget = widget_element.widget();
@@ -17865,12 +18261,38 @@ $(window).on('load', function() {
     }
   });
 }());
+(function() {
+  $.extend(scrivito, {
+    delete_workspace_command: function(workspace) {
+      return scrivito.command.create_instance({
+        id: 'delete_workspace',
+        title: scrivito.t('commands.delete_workspace.title'),
+        icon: '&#xf018;',
+
+        execute: function() {
+          scrivito.confirmation_dialog({
+            title: scrivito.t('commands.delete_workspace.dialog.title', workspace.title()),
+            description: scrivito.t('commands.delete_workspace.dialog.description'),
+            icon: '&#xf018;',
+            color: 'red',
+            confirm_button_text: scrivito.t('commands.delete_workspace.dialog.confirm'),
+            confirm_button_color: 'red'
+          }).done(function() {
+            scrivito.with_saving_overlay(workspace.destroy().then(function() {
+              return scrivito.redirect_to('?_scrivito_workspace_id=published');
+            }));
+          });
+        }
+      });
+    }
+  });
+}());
 (function() {
   $.extend(scrivito, {
     duplicate_obj_command: function(obj) {
       return scrivito.command.create_instance({
         id: 'duplicate_obj',
-        title: scrivito.i18n.translate('commands.duplicate_obj.title'),
+        title: scrivito.t('commands.duplicate_obj.title'),
         icon: '&#xf015;',
 
         present: function() {
@@ -17879,10 +18301,10 @@ $(window).on('load', function() {
 
         disabled: function() {
           if (!scrivito.editing_context.selected_workspace.is_editable()) {
-            return scrivito.i18n.translate('commands.duplicate_obj.published_workspace');
+            return scrivito.t('commands.duplicate_obj.published_workspace');
           }
           if (obj.has_children()) {
-            return scrivito.i18n.translate('commands.duplicate_obj.has_children');
+            return scrivito.t('commands.duplicate_obj.has_children');
           }
         },
 
@@ -17904,7 +18326,7 @@ $(window).on('load', function() {
 
       return scrivito.command.create_instance({
         id: 'mark_resolved_obj',
-        title: scrivito.i18n.translate(translations_namespace + '.title'),
+        title: scrivito.t(translations_namespace + '.title'),
         icon: '&#xf124;',
 
         present: function() {
@@ -17913,11 +18335,11 @@ $(window).on('load', function() {
 
         execute: function() {
           return scrivito.confirmation_dialog({
-            title: scrivito.i18n.translate('commands.mark_resolved_obj.dialog.title'),
-            description: scrivito.i18n.translate(translations_namespace + '.dialog.description'),
+            title: scrivito.t('commands.mark_resolved_obj.dialog.title'),
+            description: scrivito.t(translations_namespace + '.dialog.description'),
             icon: '&#xf124;',
             color: 'red',
-            confirm_button_text: scrivito.i18n.translate('commands.mark_resolved_obj.dialog.confirm'),
+            confirm_button_text: scrivito.t('commands.mark_resolved_obj.dialog.confirm'),
             confirm_button_color: 'red'
           }).then(function() {
             return scrivito.with_saving_overlay(obj.mark_resolved().then(function() {
@@ -17934,7 +18356,7 @@ $(window).on('load', function() {
     move_page_from_clipboard_command: function(child_list_element) {
       return scrivito.command.create_instance({
         id: 'move_page_from_clipboard',
-        title: scrivito.i18n.translate('commands.move_page_from_clipboard.title'),
+        title: scrivito.t('commands.move_page_from_clipboard.title'),
         icon: '&#xf016;',
 
         present: function() {
@@ -17944,7 +18366,7 @@ $(window).on('load', function() {
         disabled: function() {
           var obj_class_name = scrivito.obj_clipboard.obj().obj_class_name();
           if (!child_list_element.is_valid_child_class(obj_class_name)) {
-            return scrivito.i18n.translate('commands.move_page_from_clipboard.paste_forbidden',
+            return scrivito.t('commands.move_page_from_clipboard.paste_forbidden',
                 child_list_element.allowed_classes().join(', '));
           }
         },
@@ -17965,8 +18387,8 @@ $(window).on('load', function() {
     obj_details_command: function(obj) {
       return scrivito.command.create_instance({
         id: 'obj_details',
-        title: scrivito.i18n.translate('commands.obj_details.title'),
-        icon: '&#xf03d;',
+        title: scrivito.t('commands.obj_details.title'),
+        icon: '&#xf030;',
 
         present: function() {
           return obj.has_details_view();
@@ -17975,8 +18397,7 @@ $(window).on('load', function() {
         execute: function() {
           return scrivito.write_monitor.track_changes(function() {
             return scrivito.details_dialog.open({
-              title: scrivito.i18n.translate('current_page'),
-              icon: '&#xf03d;',
+              title: scrivito.t('commands.obj_details.dialog.title', obj.obj_class_name()),
               fetch_markup: function() {
                 return obj.fetch_details_markup();
               }
@@ -17992,63 +18413,111 @@ $(window).on('load', function() {
 (function() {
   $.extend(scrivito, {
     publish_workspace_command: function(workspace) {
-      var t = scrivito.i18n.translate;
-      var workspace_title = workspace.title() ||
-        t('menu_bar.empty_workspace_title');
+      var open_confirmation_dialog = function() {
+        return scrivito.confirmation_dialog({
+          title: scrivito.t('commands.publish_workspace.dialog.title', workspace.title()),
+          description: scrivito.t('commands.publish_workspace.dialog.description'),
+          icon: '&#xf064;',
+          color: 'green',
+          confirm_button_text: scrivito.t('commands.publish_workspace.dialog.confirm'),
+          confirm_button_color: 'green'
+        });
+      };
 
       var open_check_failed_dialog = function() {
         scrivito.confirmation_dialog({
-          title: scrivito.i18n.translate('commands.publish_workspace.error_dialog.title'),
-          description: scrivito.i18n.translate('commands.publish_workspace.error_dialog.description'),
+          title: scrivito.t('commands.publish_workspace.error_dialog.title'),
+          description: scrivito.t('commands.publish_workspace.error_dialog.description'),
           color: 'red',
           icon: '&#xf064;',
-          confirm_button_text: scrivito.i18n.translate('commands.publish_workspace.error_dialog.confirm')
+          confirm_button_text: scrivito.t('commands.publish_workspace.error_dialog.confirm')
         }).then(function() {
           scrivito.changes_dialog.open();
         });
       };
 
       return scrivito.command.create_instance({
-        id: 'scrivito_publish_current_ws',
-        title: t('commands.publish_workspace.title', workspace_title),
+        id: 'publish_workspace',
+        title: scrivito.t('commands.publish_workspace.title'),
         icon: '&#xf064;',
-        tooltip: t('commands.publish_workspace.title', workspace_title),
+        tooltip: scrivito.t('commands.publish_workspace.title', workspace.title()),
+
         disabled: function() {
-          if (!scrivito.user_permissions.can("publish_workspace")) {
-            return t('commands.publish_workspace.permission_denied');
+          if (!scrivito.user_permissions.can('publish_workspace')) {
+            return scrivito.t('commands.publish_workspace.permission_denied');
           }
         },
+
         execute: function() {
-          if (scrivito.user_permissions.can("publish_workspace")) {
-            scrivito.workspace_select.close_menu();
-
-            scrivito.confirmation_dialog({
-              icon: '&#xf064;',
-              color: 'green',
-              confirm_button_text: t('commands.publish_workspace.dialog.confirm'),
-              confirm_button_color: 'green',
-              title: t('commands.publish_workspace.dialog.title', workspace_title),
-              description: t('commands.publish_workspace.dialog.description')
-            }).done(function() {
-              scrivito.with_saving_overlay(
-                workspace.check_and_publish().done(function() {
-                  return scrivito.redirect_to('?_scrivito_workspace_id=published');
-                }).fail(function(error) {
-                  if (error.type) {
-                    if (error.type === 'check_failed') {
-                      open_check_failed_dialog();
-                    }
-                    if (error.type === 'outdated_certificates') {
-                      scrivito.alert_dialog(
-                        t('commands.publish_workspace.alert.invalid_certificates')
-                      );
-                    }
-                  }
-                })
-              );
+          if (scrivito.user_permissions.can('publish_workspace')) {
+            open_confirmation_dialog().done(function() {
+              scrivito.with_saving_overlay(workspace.check_and_publish().done(function() {
+                return scrivito.redirect_to('?_scrivito_workspace_id=published');
+              }).fail(function(error) {
+                if (error.type === 'check_failed') {
+                  open_check_failed_dialog();
+                } else if (error.type === 'outdated_certificates') {
+                  scrivito.alert_dialog(
+                    scrivito.t('commands.publish_workspace.alert.invalid_certificates'));
+                }
+              }));
             });
           }
-          return false;
+        }
+      });
+    }
+  });
+}());
+(function() {
+  $.extend(scrivito, {
+    rebase_workspace_command: function(workspace) {
+      return scrivito.command.create_instance({
+        id: 'rebase_workspace',
+        title: scrivito.t('commands.rebase_workspace.title'),
+        icon: '&#xf023;',
+        tooltip: scrivito.t('commands.rebase_workspace.tooltip', workspace.title()),
+
+        disabled: function() {
+          if (!workspace.is_outdated()) {
+            return scrivito.t('commands.rebase_workspace.uptodate', workspace.title());
+          }
+        },
+
+        action_required: function() {
+          return workspace.is_outdated();
+        },
+
+        execute: function() {
+          scrivito.with_saving_overlay(workspace.rebase().then(function() {
+            return scrivito.reload();
+          }));
+        }
+      });
+    }
+  });
+}());
+(function() {
+  $.extend(scrivito, {
+    rename_workspace_command: function(workspace) {
+      return scrivito.command.create_instance({
+        id: 'rename_workspace',
+        title: scrivito.t('commands.rename_workspace.title'),
+        icon: '&#xf04f;',
+
+        execute: function() {
+          scrivito.prompt_dialog({
+            title: scrivito.t('commands.rename_workspace.dialog.title', workspace.title()),
+            description: scrivito.t('commands.rename_workspace.dialog.description'),
+            value: workspace.original_title(),
+            icon: '&#xf04f;',
+            color: 'green',
+            accept_button_text: scrivito.t('commands.rename_workspace.dialog.accept'),
+            accept_button_color: 'green'
+          }).done(function(new_title) {
+            scrivito.with_saving_overlay(workspace.rename(new_title).then(function() {
+              return scrivito.reload();
+            }));
+          });
         }
       });
     }
@@ -18063,7 +18532,7 @@ $(window).on('load', function() {
 
       return scrivito.command.create_instance({
         id: 'restore_obj',
-        title: scrivito.i18n.translate(translations_namespace + '.title'),
+        title: scrivito.t(translations_namespace + '.title'),
         icon: '&#xf032;',
 
         present: function() {
@@ -18072,7 +18541,7 @@ $(window).on('load', function() {
 
         disabled: function() {
           if (scrivito.editing_context.selected_workspace.is_rtc()) {
-            return scrivito.i18n.translate(translations_namespace + '.rtc_workspace');
+            return scrivito.t(translations_namespace + '.rtc_workspace');
           }
         },
 
@@ -18094,35 +18563,37 @@ $(window).on('load', function() {
 
       return scrivito.command.create_instance({
         id: 'revert_obj',
-        title: scrivito.i18n.translate(translations_namespace + '.title'),
+        title: scrivito.t(translations_namespace + '.title'),
         icon: '&#xf032;',
 
         present: function() {
-          return obj && !obj.is_deleted();
+          return scrivito.editing_context.selected_workspace.is_editable() &&
+              obj && !obj.is_deleted();
         },
 
         disabled: function() {
-          if (!scrivito.editing_context.selected_workspace.is_editable()) {
-            return scrivito.i18n.translate('commands.revert_obj.published_workspace');
-          }
           if (scrivito.editing_context.selected_workspace.is_rtc()) {
-            return scrivito.i18n.translate(translations_namespace + '.rtc_workspace');
+            return scrivito.t(translations_namespace + '.rtc_workspace');
           }
           if (!obj.modification()) {
-            return scrivito.i18n.translate(translations_namespace + '.not_modified_obj');
+            return scrivito.t(translations_namespace + '.not_modified_obj');
           }
           if (obj.is_new()) {
-            return scrivito.i18n.translate(translations_namespace + '.new_obj');
+            return scrivito.t(translations_namespace + '.new_obj');
           }
         },
 
+        update: function() {
+          return obj.update_modification();
+        },
+
         execute: function() {
           return scrivito.confirmation_dialog({
-            title: scrivito.i18n.translate(translations_namespace + '.dialog.title'),
-            description: scrivito.i18n.translate('commands.revert_obj.dialog.description'),
+            title: scrivito.t(translations_namespace + '.dialog.title'),
+            description: scrivito.t('commands.revert_obj.dialog.description'),
             icon: '&#xf032;',
             color: 'red',
-            confirm_button_text: scrivito.i18n.translate('commands.revert_obj.dialog.confirm'),
+            confirm_button_text: scrivito.t('commands.revert_obj.dialog.confirm'),
             confirm_button_color: 'red'
           }).then(function() {
             return scrivito.with_saving_overlay(obj.revert().then(function() {
@@ -18134,12 +18605,57 @@ $(window).on('load', function() {
     }
   });
 }());
+(function() {
+  $.extend(scrivito, {
+    revert_widget_command: function(widget_element) {
+      var widget = widget_element.widget();
+      return scrivito.command.create_instance({
+        id: 'revert_widget',
+        title: scrivito.i18n.translate('commands.revert_widget.title'),
+        icon: '&#xf032;',
+
+        present: function() {
+          return scrivito.editing_context.selected_workspace.is_editable() && !widget.is_deleted();
+        },
+
+        disabled: function() {
+          if (widget.is_new()) {
+            return scrivito.i18n.translate('commands.revert_widget.is_new');
+          }
+          if (!widget.is_modified()) {
+            return scrivito.i18n.translate('commands.revert_widget.is_not_modified');
+          }
+        },
+
+        update: function() {
+          return widget.update_modification();
+        },
+
+        execute: function() {
+          return scrivito.confirmation_dialog({
+            title: scrivito.i18n.translate('commands.revert_widget.dialog.title'),
+            description: scrivito.i18n.translate('commands.revert_widget.dialog.description'),
+            icon: '&#xf032;',
+            color: 'red',
+            confirm_button_text: scrivito.i18n.translate('commands.revert_obj.dialog.confirm'),
+            confirm_button_color: 'red'
+          }).then(function() {
+            var dom_element = widget_element.dom_element();
+            scrivito.with_element_overlay(dom_element, widget.revert().then(function() {
+              dom_element.trigger('scrivito_reload');
+            }));
+          });
+        }
+      });
+    }
+  });
+}());
 (function() {
   $.extend(scrivito, {
     save_obj_to_clipboard_command: function(obj) {
       return scrivito.command.create_instance({
         id: 'save_obj_to_clipboard',
-        title: scrivito.i18n.translate('commands.save_obj_to_clipboard.title'),
+        title: scrivito.t('commands.save_obj_to_clipboard.title'),
         icon: '&#xf017;',
 
         present: function() {
@@ -18148,7 +18664,7 @@ $(window).on('load', function() {
 
         disabled: function() {
           if (obj.has_children()) {
-            return scrivito.i18n.translate('commands.save_obj_to_clipboard.has_children');
+            return scrivito.t('commands.save_obj_to_clipboard.has_children');
           }
         },
 
@@ -18164,7 +18680,7 @@ $(window).on('load', function() {
     save_widget_to_clipboard_command: function(widget_element) {
       return scrivito.command.create_instance({
         id: 'save_widget_to_clipboard',
-        title: scrivito.i18n.translate('commands.save_widget_to_clipboard.title'),
+        title: scrivito.t('commands.save_widget_to_clipboard.title'),
         icon: '&#xf017;',
 
         present: function() {
@@ -18178,22 +18694,38 @@ $(window).on('load', function() {
     }
   });
 }());
+(function() {
+  $.extend(scrivito, {
+    select_workspace_command: function(workspace) {
+      return scrivito.command.create_instance({
+        id: 'select_workspace_' + workspace.id(),
+        title: workspace.title(),
+        icon: workspace.icon(),
+
+        execute: function() {
+          scrivito.with_saving_overlay(
+              scrivito.redirect_to('?_scrivito_workspace_id=' + workspace.id()));
+        }
+      });
+    }
+  });
+}());
 (function() {
   $.extend(scrivito, {
     sort_items_command: function(child_list_element) {
       return scrivito.command.create_instance({
         id: 'sort_items',
-        title: scrivito.i18n.translate('commands.sort_items.title'),
+        title: scrivito.t('commands.sort_items.title'),
         icon: '&#xf03c;',
-        tooltip: scrivito.i18n.translate('commands.sort_items.tooltip',
+        tooltip: scrivito.t('commands.sort_items.tooltip',
             child_list_element.obj().description_for_editor()),
 
         disabled: function() {
           if (!child_list_element.has_child_order()) {
-            return scrivito.i18n.translate('commands.sort_items.auto_sort');
+            return scrivito.t('commands.sort_items.auto_sort');
           }
           if (child_list_element.children().length < 2) {
-            return scrivito.i18n.translate('commands.sort_items.too_less_children');
+            return scrivito.t('commands.sort_items.too_less_children');
           }
         },
 
@@ -18229,18 +18761,19 @@ $(window).on('load', function() {
 
       return scrivito.command.create_instance({
         id: 'switch_to_' + mode + '_mode',
-        title: scrivito.i18n.translate('commands.switch_mode.' + mode),
+        title: scrivito.t('commands.switch_mode.' + mode),
         icon: icon,
 
         disabled: function() {
           if (scrivito.editing_context.display_mode === mode) {
-            return scrivito.i18n.translate('commands.switch_mode.disabled');
+            return scrivito.t('commands.switch_mode.disabled');
           }
         },
 
         execute: function() {
           if (mode !== 'view' && !scrivito.editing_context.selected_workspace.is_editable()) {
-            scrivito.workspace.all_editable().done(function(workspaces) {
+            var fetch_workspaces = scrivito.with_saving_overlay(scrivito.workspace.all_editable());
+            fetch_workspaces.then(function(workspaces) {
               scrivito.editable_workspace_dialog.open(workspaces).done(function(workspace_id) {
                 redirect_to(mode, workspace_id);
               });
@@ -18264,26 +18797,31 @@ $(window).on('load', function() {
 (function() {
   $.extend(scrivito, {
     widget_details_command: function(widget_element) {
+      var widget = function() {
+        return widget_element.widget();
+      };
+
       return scrivito.command.create_instance({
         id: 'widget_details',
-        title: scrivito.i18n.translate('commands.widget_details.title'),
+        title: scrivito.t('commands.widget_details.title'),
         icon: '&#xf030;',
 
         present: function() {
           return scrivito.editing_context.is_editing_mode() ||
-              widget_element.widget().is_modified();
+              widget().is_modified() ||
+              widget().is_placement_modified();
         },
 
         disabled: function() {
           if (!widget_element.has_details_view()) {
-            return scrivito.i18n.translate('commands.widget_details.no_details_view');
+            return scrivito.t('commands.widget_details.no_details_view');
           }
         },
 
         execute: function() {
           return scrivito.write_monitor.track_changes(function() {
             return scrivito.details_dialog.open({
-              title: widget_element.widget().widget_class_name(),
+              title: scrivito.t('commands.widget_details.dialog.title', widget().widget_class_name()),
               fetch_markup: function() {
                 return widget_element.fetch_details_markup();
               }
@@ -18296,21 +18834,32 @@ $(window).on('load', function() {
     }
   });
 }());
+(function() {
+  $.extend(scrivito, {
+    workspace_changes_command: function() {
+      return scrivito.command.create_instance({
+        id: 'workspace_changes',
+        title: scrivito.t('commands.workspace_changes.title'),
+        icon: '&#xf080;',
+
+        execute: function() {
+          scrivito.changes_dialog.open();
+        }
+      });
+    }
+  });
+}());
 (function() {
   $.extend(scrivito, {
     workspace_settings_command: function(workspace) {
-      var title = scrivito.i18n.translate('commands.workspace_settings.title', workspace.title());
       return scrivito.command.create_instance({
         id: 'workspace_settings',
-        title: title,
+        title: scrivito.t('commands.workspace_settings.title'),
         icon: '&#xf030;',
 
-        present: function() {
-          return workspace.is_editable();
-        },
-
         execute: function() {
           workspace.fetch_memberships().then(function(memberships) {
+            var title = scrivito.t('commands.workspace_settings.dialog.title', workspace.title());
             scrivito.workspace_settings_dialog.open(title, memberships).then(function(memberships) {
               scrivito.with_saving_overlay(
                 workspace.update({memberships: memberships}).then(function() {
@@ -18357,6 +18906,7 @@ $(window).on('load', function() {
                 scrivito.widget_details_command(widget_element),
                 scrivito.save_widget_to_clipboard_command(widget_element),
                 scrivito.copy_widget_from_clipboard_command(widget_field_element, widget_element),
+                scrivito.revert_widget_command(widget_element),
                 scrivito.delete_widget_command(widget_field_element, widget_element)
               ].concat(widget_element.menu()));
             });
@@ -18391,7 +18941,7 @@ $(window).on('load', function() {
         scrivito.inplace_marker.define(function(inplace_marker) {
           if (scrivito.editing_context.is_editing_mode()) {
             _.each(scrivito.child_list_element.all(), function(child_list_element) {
-              var description = scrivito.i18n.translate('child_list_menu.description',
+              var description = scrivito.t('child_list_menu.description',
                   child_list_element.obj().description_for_editor());
               inplace_marker.activate_for(child_list_element, {description: description});
             });
@@ -18426,10 +18976,10 @@ $(window).on('load', function() {
           if (scrivito.editing_context.selected_workspace.is_editable()) {
             _.each(scrivito.widget_field_element.all(), function(widget_field_element) {
               _.each(widget_field_element.widget_elements(), function(widget_element) {
-                var is_modified = widget_element.widget().modification() ||
-                    widget_element.widget().container_modification();
+                var show_as_modified = widget_element.widget().is_modified() ||
+                    widget_element.widget().is_placement_modified();
                 if (scrivito.editing_context.is_editing_mode() ||
-                    scrivito.editing_context.is_comparing_mode() && is_modified) {
+                    scrivito.editing_context.is_comparing_mode() && show_as_modified) {
                   inplace_marker.activate_for(widget_element,
                       inplace_marker_options(widget_element));
                 }
@@ -18447,7 +18997,7 @@ $(window).on('load', function() {
     if (scrivito.editing_context.is_comparing_mode()) {
       var tooltip_translation_key;
       var modification = widget_element.widget().modification();
-      var container_modification = widget_element.widget().container_modification();
+      var placement_modification = widget_element.widget().placement_modification();
 
       switch (modification) {
         case 'new':
@@ -18460,7 +19010,7 @@ $(window).on('load', function() {
           break;
         case 'edited':
           options.icon = '\uf035';
-          switch (container_modification) {
+          switch (placement_modification) {
             case 'new':
               tooltip_translation_key = 'widget_is_edited_and_dragged_here';
               options.css_classes = 'scrivito_widget_moved_icon';
@@ -18475,7 +19025,7 @@ $(window).on('load', function() {
           break;
         default:
           options.icon = '\uf03c';
-          switch (container_modification) {
+          switch (placement_modification) {
             case 'new':
               tooltip_translation_key = 'widget_is_dragged_here';
               break;
@@ -18486,7 +19036,7 @@ $(window).on('load', function() {
       }
 
       if (tooltip_translation_key) {
-        options.tooltip = scrivito.i18n.translate('widget_marker.' + tooltip_translation_key);
+        options.tooltip = scrivito.t('widget_marker.' + tooltip_translation_key);
       }
     }
 
@@ -18715,14 +19265,14 @@ $(window).on('load', function() {
 
       view.on('focus click', '.scrivito_input_list_of_ws', function(e) {
         create_new_ws = false;
-        view.find(".scrivito_confirm").html(scrivito.i18n.translate('editable_ws_dialog.select'));
+        view.find(".scrivito_confirm").html(scrivito.t('editable_ws_dialog.select'));
         view.find(".scrivito_disabled").removeClass("scrivito_disabled");
         view.find(".scrivito_input_new_ws_name label, .scrivito_input_new_ws_name input").addClass("scrivito_disabled");
       });
 
       view.on('focus click drop', '.scrivito_input_new_ws_name', function(e) {
         create_new_ws = true;
-        view.find(".scrivito_confirm").html(scrivito.i18n.translate('menu_bar.create'));
+        view.find(".scrivito_confirm").html(scrivito.t('menu_bar.create'));
         view.find(".scrivito_disabled").removeClass("scrivito_disabled");
         view.find(".scrivito_input_list_of_ws label, .scrivito_input_list_of_ws select").addClass("scrivito_disabled");
       });
@@ -18875,9 +19425,9 @@ $(window).on('load', function() {
               }));
             }
           },
-          formatNoMatches: scrivito.i18n.translate('workspace_settings_dialog.nothing_found'),
-          formatSearching: scrivito.i18n.translate('workspace_settings_dialog.searching'),
-          formatInputTooShort: scrivito.i18n.translate('workspace_settings_dialog.too_short')
+          formatNoMatches: scrivito.t('workspace_settings_dialog.nothing_found'),
+          formatSearching: scrivito.t('workspace_settings_dialog.searching'),
+          formatInputTooShort: scrivito.t('workspace_settings_dialog.too_short')
         });
 
         view.find('.scrivito_confirm').on('click', confirm);
@@ -18901,7 +19451,7 @@ $(window).on('load', function() {
   $.extend(scrivito, {
     warn_before_unloading: function() {
       if (scrivito.write_monitor.is_writing()) {
-        return scrivito.i18n.translate('warn_before_unloading');
+        return scrivito.t('warn_before_unloading');
       }
     }
   });
@@ -18981,80 +19531,12 @@ $(window).on('load', function() {
     return data || {};
   };
 })();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//
-
-//
-
-
-
-//
-
-
-
-//
-
-
-
-
-
-
-
-
-
-
-;
+(function() {
+  $(function() {
+    var config = $('[data-scrivito-private-config]').data('scrivito-private-config');
+    if (config) {
+      scrivito.init(config);
+      scrivito.gui.start();
+    }
+  });
+}());