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, 31 insertions, 30 deletions

diff --git a/node_modules/montage/data/restriction.js b/node_modules/montage/data/restriction.js
index 53c2f19d..3a4896b8 100755
--- a/node_modules/montage/data/restriction.js
+++ b/node_modules/montage/data/restriction.js
@@ -1,36 +1,36 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
 /**
-        @module montage/data/restriction
-    @requires montage/core/core
-    @requires montage/core/logger
-*/
+ @module montage/data/restriction
+ @requires montage/core/core
+ @requires montage/core/logger
+ */
 var Montage = require("montage").Montage;
-// var Selector = require("data/selector").Selector;
 var logger = require("core/logger").logger("restrictions");
 /**
-    @class module:montage/data/restriction.Restriction
-    @extends module:montage/core/core.Montage
-*/
-var Restriction = exports.Restriction = Montage.create(Montage,/** @lends module:montage/data/restriction.Restriction# */ {
-/**
-        Description TODO
-        @type {Property}
-        @default {String} ""
-    */
+ @class module:montage/data/restriction.Restriction
+ @extends module:montage/core/core.Montage
+ */
+var Restriction = exports.Restriction = Montage.create(Montage, /** @lends module:montage/data/restriction.Restriction# */ {
+    /**
+     Description TODO
+     @type {Property}
+     @default {String} ""
+     */
     name: {
         serializable: true,
         enumerable: true,
         value: ""
     },
-/**
-        Description TODO
-        @type {Property}
-        @default  {String}{}
-    */
+
+    /**
+     Description TODO
+     @type {Property}
+     @default  {String}{}
+     */
     parameters: {
         value: {},
         serializable: true,
@@ -38,13 +38,14 @@ var Restriction = exports.Restriction = Montage.create(Montage,/** @lends module
         enumerable: false,
         writable: false
     },
-/**
-    Description TODO
-    @function
-    @param {String} name To be initialized
-    @param {String} parameters To be initialized
-    @returns itself
-    */
+
+    /**
+     Description TODO
+     @function
+     @param {String} name To be initialized
+     @param {String} parameters To be initialized
+     @returns itself
+     */
     initWithNameAndParameters: {
         enumerable: false,
         value: function(name, parameters) {