Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

2 files changed, 32 insertions, 3 deletions

diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 60894fbc..8b808488 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -105,7 +105,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "properties": {
                 "element": { "#": "branchList" },
                 "contentController": {"@": "arrayController" },
-                "selectionEnabled": true
+                "isSelectionEnabled": true
             }
         },
 
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.js b/js/components/treeview/ninja-branch.reel/ninja-branch.js
index 0d1a1d0e..72ef3ccd 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.js
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.js
@@ -8,12 +8,41 @@ var Montage = require("montage").Montage,
     TreeNode = require("js/components/treeview/tree-node").TreeNode;
 
 var Branch = exports.Branch = Montage.create(TreeNode, {
-    hasTemplate:{
-        value:true
+    label: {
+        value: null
+//        serializable: true
     },
+
+    branchList: {
+        value: null
+//        serializable: true
+    },
+
+    arrayController: {
+        value: null
+//        serializable: true
+    },
+
     repetition:{
         value: null
+//        serializable: true
+    },
+
+    leafComponent: {
+        value: null
+//        serializable: true
+    },
+
+    branchComponent: {
+        value: null
+//        serializable: true
     },
+
+    collapser: {
+        value: null
+//        serializable: true
+    },
+
     prepareForDraw : {
         value: function() {
             this.collapser.removeAttribute('id');