49 files changed, 855 insertions, 189 deletions

diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js
index 8df868a2..a6c3ff6d 100755
--- a/js/components/SliderBase.js
+++ b/js/components/SliderBase.js
@@ -83,7 +83,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 
     // Internal flags to determine what the change/changing events will contain
@@ -153,7 +154,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 
     _maxValue: {
@@ -175,7 +177,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 
     _valueCoef: {
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index bc433f52..29f49b7b 100755
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -20,7 +20,8 @@ exports.Combobox = Montage.create(Component, {
     },
 
     labelField: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     labelFunction: {
@@ -28,7 +29,8 @@ exports.Combobox = Montage.create(Component, {
     },
 
     dataField: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     dataFunction: {
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index cb95ca1d..bc3d0860 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -30,7 +30,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
         },
         set: function(value) {
             this._delegate = value;
-        }
+        },
+        serializable: true
     },
 
     rootKey : {
@@ -38,7 +39,13 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
     },
 
     branchKey : {
-        value: null
+        value: null,
+        serializable: true
+    },
+
+    labelKey: {
+        value: null,
+        serializable: true
     },
 
     _root : {
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 0dabc781..68f3be2b 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -40,7 +40,7 @@
                 "buttonsListController": {
                     "prototype": "montage/ui/controller/array-controller",
                     "bindings": {
-                        "content": {"<<->": "@owner.containerElements"}
+                        "content": {"<->": "@owner.containerElements"}
                     }
                 },
 
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 260922b3..a3c743a4 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -9,6 +9,11 @@ var Montage = require("montage/core/core").Montage,
 
 exports.Breadcrumb = Montage.create(Component, {
 
+    breadcrumbBt: {
+        value: null,
+        serializable: true
+    },
+
     _currentDocument: {
         enumerable: false,
         value: null
@@ -100,6 +105,7 @@ exports.Breadcrumb = Montage.create(Component, {
 
             // TODO: This is bound 2 ways, update the internal property
             this.currentDocument.model.domContainer = this.containerElements[i].node;
+            this.application.ninja.selectionController.executeSelectElement();
         }
     }