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

1 files changed, 5 insertions, 2 deletions

diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
index 1bfe66a4..652d3bc0 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -8,9 +8,12 @@ var Montage   = require("montage/core/core").Montage,
     TreeNode = require("js/components/treeview/tree-node").TreeNode;
 
 exports.Leaf = Montage.create(TreeNode, {
-    hasTemplate: {
-        value: true
+
+    label: {
+        value: null,
+        serializable: true
     },
+
     templateDidLoad : {
         value: function() {
             var event = this.treeView.activationEvent;