Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes

Conflicts:
	js/panels/properties.reel/sections/position-size.reel/position-size.html

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

2 files changed, 9 insertions, 0 deletions

diff --git a/js/components/toolbar.reel/toolbar-button.js b/js/components/toolbar.reel/toolbar-button.js
index 9ada9b29..74129c2a 100644
--- a/js/components/toolbar.reel/toolbar-button.js
+++ b/js/components/toolbar.reel/toolbar-button.js
@@ -12,6 +12,10 @@ var ToolbarButton = exports.ToolbarButton = Montage.create(Button, {
     hasTemplate : {
         value: false
     },
+    label: {
+        value: null,
+        serializable: true
+    },
     _sourceObject : {
         value: null
     },
diff --git a/js/components/toolbar.reel/toolbar.js b/js/components/toolbar.reel/toolbar.js
index 2ccdb2c5..43f45f2b 100644
--- a/js/components/toolbar.reel/toolbar.js
+++ b/js/components/toolbar.reel/toolbar.js
@@ -8,6 +8,11 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.Toolbar = Montage.create(Component, {
+    repetition: {
+        value: null,
+        serializable: true
+    },
+    
     _needsButtonProperties : {
         value: null
     },