55 files changed, 1053 insertions, 1093 deletions

diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index 03ef7b9e..1e9222fd 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -28,7 +28,7 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
     },
 
     branchKey : {
-        value: 'children'
+        value: null
     },
 
     _root : {
@@ -98,7 +98,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
    },
 
     branchControllers: {
-        value: []
+        value: [],
+        distinct: true
     },
 
     addBranchController : {
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index d8c212e8..a3a9350e 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.css
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -26,7 +26,7 @@
     cursor: pointer;
     font-weight: bold;
     padding: 3px 0 4px;
-    text-shadow: 1px 1px 0 #000;
+    text-shadow: 1px 1px 1px #000;
 }
 
 /* First Level */
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
index 085b11e0..fedc1d9d 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -19,7 +19,6 @@
 /* Second level */
 .branch .branch .leaf-label {
     background-position: 25px center;
-    box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);
     color: #FFF;
     padding-left: 45px;
 }
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
index c6416693..1bfe66a4 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -63,7 +63,8 @@ exports.Leaf = Montage.create(TreeNode, {
             'dblclick'  : 'handleDblclick',
             'dragstart' : 'handleDragStart',
             'dragend'   : 'handleDragEnd'
-        }
+        },
+        distinct: true
     }
 
 
diff --git a/js/components/treeview/tree-node.js b/js/components/treeview/tree-node.js
index 689fc233..d7b864b5 100644
--- a/js/components/treeview/tree-node.js
+++ b/js/components/treeview/tree-node.js
@@ -44,7 +44,9 @@ exports.TreeNode = Montage.create(Component, {
             if(!object) {
                 return;
             }
+
             if(object[this.branchKey]) {
+                this.childNodes.length = 0;
                 object[this.branchKey].forEach(function(node) {
                     this.childNodes.push(node);
                 }, this);
diff --git a/node_modules/montage/core/converter/converter.js b/node_modules/montage/core/converter/converter.js
index abce44e2..a23d2702 100755
--- a/node_modules/montage/core/converter/converter.js
+++ b/node_modules/montage/core/converter/converter.js
@@ -20,16 +20,6 @@ var FUNCTION_CLASS = '[object Function]',
 
 var _toString = Object.prototype.toString;
 
-// TODO should maybe move these into String.isString and Number.isNumber to parallel Array.isArray
-
-/**
-    @exports module:montage/core/converter#isString
-    @function
-*/
-var isString = function(object) {
-    return _toString.call(object) === STRING_CLASS;
-};
-exports.isString = isString;
 
 /**
     @exports module:montage/core/converter#isNumber
diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js
index f0d3e540..f484f7aa 100755
--- a/node_modules/montage/core/converter/date-converter.js
+++ b/node_modules/montage/core/converter/date-converter.js
@@ -2502,16 +2502,13 @@ var _toString = Object.prototype.toString;
 var isDate = function(object) {
     return _toString.call(object) === DATE_CLASS;
 };
-var isString = function(object) {
-    return _toString.call(object) === STRING_CLASS;
-};
 var isNumber = function(object) {
     return _toString.call(object) === NUMBER_CLASS;
 };