Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

49 files changed, 5797 insertions, 1876 deletions

diff --git a/node_modules/montage/ui/bluemoon/slider.reel/slider.js b/node_modules/montage/ui/bluemoon/slider.reel/slider.js
index 56c4faa8..1a0e3d6e 100644
--- a/node_modules/montage/ui/bluemoon/slider.reel/slider.js
+++ b/node_modules/montage/ui/bluemoon/slider.reel/slider.js
@@ -4,7 +4,7 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 /**
-        @module "montage/ui/bluemoon/slider.reel"
+    @module "montage/ui/bluemoon/slider.reel"
     @requires montage/core/core
     @requires montage/ui/component
 */
@@ -199,6 +199,9 @@ exports.Slider = Montage.create(Component,/** @lends module:"montage/ui/bluemoon
         },
         set: function (value) {
             if (value !== this._minValue) {
+                if(String.isString(value)) {
+                    value = parseFloat(value);
+                }
                 this._minValue = value;
                 this._valueRange = null;
                 this.needsDraw = true;
@@ -226,6 +229,9 @@ exports.Slider = Montage.create(Component,/** @lends module:"montage/ui/bluemoon
         },
         set: function (value) {
             if (value !== this._maxValue) {
+                if(String.isString(value)) {
+                    value = parseFloat(value);
+                }
                 this._maxValue = value;
                 this._valueRange = null;
                 this.needsDraw = true;
@@ -288,6 +294,9 @@ exports.Slider = Montage.create(Component,/** @lends module:"montage/ui/bluemoon
         },
         set: function (value) {
             if (!isNaN(value)) {
+                if(String.isString(value)) {
+                    value = parseFloat(value);
+                }
                 if (value !== this._value) {
                     this._value = parseFloat(value);
                     this.needsDraw = true;
@@ -450,7 +459,8 @@ exports.Slider = Montage.create(Component,/** @lends module:"montage/ui/bluemoon
     */
     handleMousemove: {
         value: function (event) {
-            this.value = this._value + ((event.clientX - this._cursorPosition) * (this.valueRange)) / this._width;
+            this.value = this.value + ((event.clientX - this._cursorPosition) * (this.valueRange)) / this._width;
+
             this._cursorPosition = event.clientX;
             event.preventDefault();
             event.stopPropagation();
diff --git a/node_modules/montage/ui/button.reel/button.js b/node_modules/montage/ui/button.reel/button.js
index 5da92482..315cf505 100644
--- a/node_modules/montage/ui/button.reel/button.js
+++ b/node_modules/montage/ui/button.reel/button.js
@@ -13,6 +13,24 @@ var Montage = require("montage").Montage,
  */
 var Button = exports.Button = Montage.create(NativeControl, {
 
+    /**
+    @event
+    @name action
+    @param {Event} event
+
+    Dispatched when the button is activated through a mouse click, finger tap,
+    or when focused and the spacebar is pressed.
+    */
+
+    /**
+    @event
+    @name hold
+    @param {Event} event
+
+    Dispatched when the button is pressed for a period of time, set by
+    {@link holdTimeout}.
+    */
+
 /**
   Description TODO
   @private
@@ -105,6 +123,23 @@ var Button = exports.Button = Montage.create(NativeControl, {
     },
 
     /**
+    How long a press has to last for a hold event to be dispatched
+    */
+    holdTimeout: {
+        get: function() {
+            return this._pressComposer.longPressTimeout;
+        },
+        set: function(value) {
+            this._pressComposer.longPressTimeout = value;
+        }
+    },
+
+    _pressComposer: {
+        enumberable: false,
+        value: null
+    },
+
+    /**
     True when the button is being interacted with, either through mouse click or
     touch event.
     @private
@@ -129,13 +164,28 @@ var Button = exports.Button = Montage.create(NativeControl, {
         }
     },
 
+    didCreate: {
+        value: function() {
+            this._pressComposer = PressComposer.create();
+            this.addComposer(this._pressComposer);
+        }
+    },
+
     prepareForActivationEvents: {