Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/node_modules/montage/core/shim/structures.js b/node_modules/montage/core/shim/structures.js
index 2f3d7d05..fb8e2191 100755
--- a/node_modules/montage/core/shim/structures.js
+++ b/node_modules/montage/core/shim/structures.js
@@ -17,9 +17,9 @@
  @classdesc Provides a Map data structure for managing key/value pairs, including methods for querying and manipulating map elements. A map cannot contain duplicate keys; each key can map to at most one value.
  */
 exports.Map = Map;
-function Map(ignored, options) {
+function Map(reserved, options) {
     if (!(this instanceof Map)) {
-        return new Map(ignored, options);
+        return new Map(reserved, options);
     }
     options = options || {};
     var eq = options.eq || Set.eq;
@@ -131,9 +131,9 @@ Object.defineProperties(Map.prototype, /** @lends module:montage/core/shim/struc
  @class module:montage/core/shim/structures.Set
  */
 exports.Set = Set;
-function Set(ignored, options) {
+function Set(reserved, options) {
     if (!(this instanceof Set)) {
-        return new Set(ignored, options);
+        return new Set(reserved, options);
     }
     options = options || {};
     var eq = options.eq || Set.eq;
@@ -238,13 +238,13 @@ Object.defineProperties(Set.prototype, /** @lends module:montage/core/shim/struc
 });
 /**
     @class module:montage/core/shim/structures.OrderedSet
-    @param {boolean} ignored
+    @param {boolean} reserved
     @param {object} options
 */
 exports.OrderedSet = OrderedSet;
-function OrderedSet(ignored, options) {
+function OrderedSet(reserved, options) {
     if (!(this instanceof OrderedSet)) {
-        return new OrderedSet(ignored, options);
+        return new OrderedSet(reserved, options);
     }
     options = options || {};
     var eq = options.eq || OrderedSet.eq;
@@ -397,14 +397,14 @@ Set.hash = function (value) {
 /**
     @exports CacheMap
     @function
-    @param {Boolean} ignored
+    @param {Boolean} reserved
     @param {String} options
-    @returns new CacheMap(ignored, options)
+    @returns new CacheMap(reserved, options)
     */
 exports.CacheMap = CacheMap;
-function CacheMap(ignored, options) {
+function CacheMap(reserved, options) {
     if (!(this instanceof CacheMap)) {
-        return new CacheMap(ignored, options);
+        return new CacheMap(reserved, options);
     }
     options = options || {};