Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/node_modules/montage/ui/toggle-button.reel/toggle-button.js b/node_modules/montage/ui/toggle-button.reel/toggle-button.js
index e12e9ba0..640f7b9b 100644
--- a/node_modules/montage/ui/toggle-button.reel/toggle-button.js
+++ b/node_modules/montage/ui/toggle-button.reel/toggle-button.js
@@ -16,9 +16,11 @@ var Montage = require("montage").Montage,
 /**
   The ToggleButton component extends the Button component to include state management (pressed or not pressed), and the ability to specify labels and CSS classes for each state.
   @class module:"montage/ui/toggle-button.reel".ToggleButton
-  @extends module:"montage/button.reel".Button
+  @extends module:"montage/ui/button.reel".Button
  */
 var ToggleButton = exports.ToggleButton = Montage.create(Button, /** @lends module:"montage/ui/toggle-button.reel".ToggleButton# */ {
+    hasTemplate: {value: true},
+
     _pressed: {
         value: false
     },
@@ -115,11 +117,12 @@ var ToggleButton = exports.ToggleButton = Montage.create(Button, /** @lends modu
     */
     label: {
         get: function() {
-            return Object.getOwnPropertyDescriptor(Object.getPrototypeOf(ToggleButton),"label").get.call(this);
+            return Object.getPropertyDescriptor(Button,"label").get.call(this);
         },
         set: function(value) {
             // Call super
-            Object.getOwnPropertyDescriptor(Object.getPrototypeOf(ToggleButton),"label").set.call(this, value);
+            //Object.getOwnPropertyDescriptor(Object.getPrototypeOf(ToggleButton),"label").set.call(this, value);
+            Object.getPropertyDescriptor(Button, "label").set.call(this, value);
             if (this._pressed === true && this._label === this._unpressedLabel) {
                 this.pressed = false;
             } else if (this._pressed === false && this._label === this._pressedLabel) {